diff options
| -rw-r--r-- | asn1/spnego/packet-spnego-template.c | 2 | ||||
| -rw-r--r-- | asn1/spnego/spnego.cnf | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 18 |
3 files changed, 9 insertions, 13 deletions
diff --git a/asn1/spnego/packet-spnego-template.c b/asn1/spnego/packet-spnego-template.c index 1ed16f9fb1..098893c30b 100644 --- a/asn1/spnego/packet-spnego-template.c +++ b/asn1/spnego/packet-spnego-template.c @@ -1239,7 +1239,7 @@ dissect_spnego_wrap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - + MechType_oid = NULL; /* * We need this later, so lets get it now ... diff --git a/asn1/spnego/spnego.cnf b/asn1/spnego/spnego.cnf index 137493e675..1da039c96a 100644 --- a/asn1/spnego/spnego.cnf +++ b/asn1/spnego/spnego.cnf @@ -23,8 +23,6 @@ NegTokenInit/mechListMIC negTokenInit_mechListMIC gssapi_oid_value *value; - MechType_oid = NULL; - %(DEFAULT_BODY)s value = gssapi_lookup_oid_str(MechType_oid); diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index 373ea0cfa4..29e63bee03 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -161,8 +161,6 @@ dissect_spnego_MechType(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset gssapi_oid_value *value; - MechType_oid = NULL; - offset = dissect_ber_object_identifier_str(implicit_tag, actx, tree, tvb, offset, hf_index, &MechType_oid); @@ -197,7 +195,7 @@ static const ber_sequence_t MechTypeList_sequence_of[1] = { static int dissect_spnego_MechTypeList(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 93 "spnego.cnf" +#line 91 "spnego.cnf" conversation_t *conversation; @@ -246,7 +244,7 @@ dissect_spnego_ContextFlags(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 114 "spnego.cnf" +#line 112 "spnego.cnf" tvbuff_t *mechToken_tvb = NULL; @@ -271,7 +269,7 @@ dissect_spnego_T_mechToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_spnego_T_NegTokenInit_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 128 "spnego.cnf" +#line 126 "spnego.cnf" gint8 class; gboolean pc; @@ -352,7 +350,7 @@ dissect_spnego_T_negResult(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int off static int dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 166 "spnego.cnf" +#line 164 "spnego.cnf" conversation_t *conversation; @@ -381,7 +379,7 @@ dissect_spnego_T_supportedMech(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 189 "spnego.cnf" +#line 187 "spnego.cnf" tvbuff_t *responseToken_tvb; @@ -415,7 +413,7 @@ dissect_spnego_T_responseToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int static int dissect_spnego_T_mechListMIC(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 216 "spnego.cnf" +#line 214 "spnego.cnf" tvbuff_t *mechListMIC_tvb; @@ -511,7 +509,7 @@ dissect_spnego_PrincipalSeq(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int of static int dissect_spnego_InnerContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 50 "spnego.cnf" +#line 48 "spnego.cnf" gssapi_oid_value *next_level_value_lcl; proto_item *item; @@ -1722,7 +1720,7 @@ dissect_spnego_wrap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) asn1_ctx_t asn1_ctx; asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - + MechType_oid = NULL; /* * We need this later, so lets get it now ... |