Author: elecharny
Date: Thu May 5 10:09:49 2005
New Revision: 168358
URL: http://svn.apache.org/viewcvs?rev=168358&view=rev
Log:
Changed some states name to avoid collision between NegTokenInit and
NegTokenTarg
Modified:
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
Modified:
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
URL:
http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java?rev=168358&r1=168357&r2=168358&view=diff
==============================================================================
---
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
(original)
+++
directory/sandbox/trunk/asn1-new-codec/src/java/org/apache/asn1/spnego/codec/grammars/SpnegoGrammar.java
Thu May 5 10:09:49 2005
@@ -710,36 +710,36 @@
// Nothing to do.
super.transitions[SpnegoStatesEnum.SPNEGO_NEG_TOKEN_INIT_SEQUENCE_FOLLOWING_TAG][0xA3]
=
new GrammarTransition(
SpnegoStatesEnum.SPNEGO_NEG_TOKEN_INIT_SEQUENCE_FOLLOWING_TAG,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH, null );
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH, null );
// mechListMIC [3] OCTET STRING OPTIONAL } (Tag)
// We are coming from the mechType state
// Nothing to do.
super.transitions[SpnegoStatesEnum.SPNEGO_MECH_TYPE_FOLLOWING_TAG][0xA3] =
new GrammarTransition(
SpnegoStatesEnum.SPNEGO_MECH_TYPE_FOLLOWING_TAG,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH, null );
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH, null );
// mechListMIC [3] OCTET STRING OPTIONAL } (Tag)
// We are coming from the ContextFlags state
// Nothing to do.
super.transitions[SpnegoStatesEnum.SPNEGO_REQ_FLAGS_FOLLOWING_TAG][0xA3] =
new GrammarTransition(
SpnegoStatesEnum.SPNEGO_REQ_FLAGS_FOLLOWING_TAG,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH, null );
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH, null );
// mechListMIC [3] OCTET STRING OPTIONAL } (Tag)
// We are coming from the mechToken state
// Nothing to do.
super.transitions[SpnegoStatesEnum.SPNEGO_METH_TOKEN_FOLLOWING_TAG][0xA3] =
new GrammarTransition(
SpnegoStatesEnum.SPNEGO_METH_TOKEN_FOLLOWING_TAG,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH, null );
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH, null );
// NegTokenInit ::= SEQUENCE {
// ...
// mechListMIC [3] OCTET STRING OPTIONAL } (Length)
// We have to check the length.
- super.transitions[SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH][0xA3] =
- new GrammarTransition(
SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_LENGTH,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_VALUE,
+
super.transitions[SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH][0xA3] =
+ new GrammarTransition(
SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_LENGTH,
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_VALUE,
new GrammarAction( "Mech List MIC Length" )
{
public void action( IAsn1Container container ) throws
DecoderException
@@ -763,26 +763,26 @@
// ...
// mechListMIC [3] OCTET STRING OPTIONAL } (Value)
// Nothing to do, the value follows.
- super.transitions[SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_VALUE][0xA3] =
- new GrammarTransition( SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_VALUE,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_TAG, null );
+
super.transitions[SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_VALUE][0xA3] =
+ new GrammarTransition(
SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_VALUE,
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_TAG,
null );
//============================================================================================
// mechListMICString State
//--------------------------------------------------------------------------------------------
// mechListMIC [3] OCTET STRING OPTIONAL } (Tag)
// The mechListMIC tag. It's an OctetString.
-
super.transitions[SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_TAG][0x04]
=
+
super.transitions[SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_TAG][0x04]
=
new GrammarTransition(
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_TAG,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_LENGTH,
null );
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_TAG,
+
SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_LENGTH, null );
// mechListMIC [3] OCTET STRING OPTIONAL } (Length)
// Checks the length. If the length is 0, we will allocate an empty
OctetString.
-
super.transitions[SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_LENGTH][0x04]
=
+
super.transitions[SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_LENGTH][0x04]
=
new GrammarTransition(
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_LENGTH,
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_VALUE,
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_LENGTH,
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_VALUE,
new GrammarAction( "Mech ListMIC Length" )
{
public void action( IAsn1Container container ) throws
DecoderException
@@ -834,9 +834,9 @@
// mechListMIC [3] OCTET STRING OPTIONAL } (Value)
// Stores the MechListMIC OctetString. This is the last transition.
-
super.transitions[SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_VALUE][0x04]
=
+
super.transitions[SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_VALUE][0x04]
=
new GrammarTransition(
- SpnegoStatesEnum.SPNEGO_MECH_LIST_MIC_OCTET_STRING_VALUE, -1,
+ SpnegoStatesEnum.SPNEGO_INIT_MECH_LIST_MIC_OCTET_STRING_VALUE,
-1,
new GrammarAction( "Mech ListMIC Value" )
{
public void action( IAsn1Container container ) throws
DecoderException
