diff options
Diffstat (limited to 'epan/dissectors/packet-spnego.c')
| -rw-r--r-- | epan/dissectors/packet-spnego.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/epan/dissectors/packet-spnego.c b/epan/dissectors/packet-spnego.c index b39f301f92..841b4d407b 100644 --- a/epan/dissectors/packet-spnego.c +++ b/epan/dissectors/packet-spnego.c @@ -143,8 +143,6 @@ static gint ett_spnego_InitialContextToken_U = -1; /*--- End of included file: packet-spnego-ett.c ---*/ #line 98 "packet-spnego-template.c" -static dissector_handle_t data_handle; - /* * Unfortunately, we have to have a forward declaration of this, * as the code generated by asn2wrs includes a call before the @@ -606,7 +604,7 @@ dissect_spnego_InitialContextToken(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, /*--- End of included file: packet-spnego-fn.c ---*/ -#line 111 "packet-spnego-template.c" +#line 109 "packet-spnego-template.c" /* * This is the SPNEGO KRB5 dissector. It is not true KRB5, but some ASN.1 * wrapped blob with an OID, USHORT token ID, and a Ticket, that is also @@ -1963,7 +1961,7 @@ void proto_register_spnego(void) { "", HFILL }}, /*--- End of included file: packet-spnego-hfarr.c ---*/ -#line 1379 "packet-spnego-template.c" +#line 1377 "packet-spnego-template.c" }; /* List of subtrees */ @@ -1985,7 +1983,7 @@ void proto_register_spnego(void) { &ett_spnego_InitialContextToken_U, /*--- End of included file: packet-spnego-ettarr.c ---*/ -#line 1389 "packet-spnego-template.c" +#line 1387 "packet-spnego-template.c" }; /* Register protocol */ @@ -2014,9 +2012,8 @@ void proto_reg_handoff_spnego(void) { /* Register protocol with GSS-API module */ - spnego_handle = create_dissector_handle(dissect_spnego, proto_spnego); - spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap, - proto_spnego); + spnego_handle = find_dissector("spnego"); + spnego_wrap_handle = new_create_dissector_handle(dissect_spnego_wrap, proto_spnego); gssapi_init_oid("1.3.6.1.5.5.2", proto_spnego, ett_spnego, spnego_handle, spnego_wrap_handle, "SPNEGO - Simple Protected Negotiation"); @@ -2030,10 +2027,8 @@ void proto_reg_handoff_spnego(void) { * See the archive of <ietf-krb-wg@anl.gov> for the thread topic * SPNEGO implementation issues. 3-Dec-2002. */ - spnego_krb5_handle = create_dissector_handle(dissect_spnego_krb5, - proto_spnego_krb5); - spnego_krb5_wrap_handle = new_create_dissector_handle(dissect_spnego_krb5_wrap, - proto_spnego_krb5); + spnego_krb5_handle = find_dissector("spnego-krb5"); + spnego_krb5_wrap_handle = find_dissector("spnego-krb5-wrap"); gssapi_init_oid("1.2.840.48018.1.2.2", proto_spnego_krb5, ett_spnego_krb5, spnego_krb5_handle, spnego_krb5_wrap_handle, "MS KRB5 - Microsoft Kerberos 5"); @@ -2044,8 +2039,4 @@ void proto_reg_handoff_spnego(void) { spnego_krb5_handle, spnego_krb5_wrap_handle, "KRB5 - Kerberos 5 - User to User"); - /* - * Find the data handle for some calls - */ - data_handle = find_dissector("data"); } |