diff options
| author | AndersBroman <a.broman@bredband.net> | 2014-04-16 21:58:16 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-04-17 08:29:39 +0000 |
| commit | dea68bf00f7c5872950814da81ba532a6372ccb3 (patch) | |
| tree | 808b3689c3cdea104589c8781270824b0e40a0df /asn1 | |
| parent | 791dd4e1285e10ab875ef741ec16fdbd406cf034 (diff) | |
| download | wireshark-dea68bf00f7c5872950814da81ba532a6372ccb3.tar.gz | |
Switch to using the ASN1 based kerberos dissector.
Change-Id: Ib8945cdad149b71e3f79bd88032fd10f55ba556d
Reviewed-on: https://code.wireshark.org/review/1174
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/Makefile.am | 3 | ||||
| -rw-r--r-- | asn1/Makefile.nmake | 2 | ||||
| -rw-r--r-- | asn1/kerberos/packet-kerberos-template.c | 5 |
3 files changed, 5 insertions, 5 deletions
diff --git a/asn1/Makefile.am b/asn1/Makefile.am index 80775a7780..d76fc581e7 100644 --- a/asn1/Makefile.am +++ b/asn1/Makefile.am @@ -65,6 +65,7 @@ SUBDIRS = \ ilp \ inap \ isdn-sup \ + kerberos \ lcsap \ ldap \ logotypecertextn \ @@ -125,10 +126,8 @@ SUBDIRS = \ x509if \ x509sat -# kerberos is a handwritten dissector, don't replace # x721 doesn't build DONT_BUILD_SUBDIRS = \ - kerberos \ x721 DIST_SUBDIRS = $(SUBDIRS) $(DONT_BUILD_SUBDIRS) diff --git a/asn1/Makefile.nmake b/asn1/Makefile.nmake index 7d921fbb44..802dbf3a0c 100644 --- a/asn1/Makefile.nmake +++ b/asn1/Makefile.nmake @@ -69,7 +69,7 @@ BER_LIST= \ idmp \ inap \ isdn-sup \ -### kerberos \ + kerberos \ ldap \ logotypecertextn \ mms \ diff --git a/asn1/kerberos/packet-kerberos-template.c b/asn1/kerberos/packet-kerberos-template.c index 8347a02055..db5b0e5ac6 100644 --- a/asn1/kerberos/packet-kerberos-template.c +++ b/asn1/kerberos/packet-kerberos-template.c @@ -73,6 +73,7 @@ #include <wsutil/file_util.h> #include <epan/packet.h> +#include <epan/exceptions.h> #include <epan/strutil.h> #include <epan/conversation.h> @@ -2021,7 +2022,7 @@ void proto_register_kerberos(void) { } static int wrap_dissect_gss_kerb(tvbuff_t *tvb, int offset, packet_info *pinfo, - proto_tree *tree, guint8 *drep _U_) + proto_tree *tree, dcerpc_info *di _U_,guint8 *drep _U_) { tvbuff_t *auth_tvb; @@ -2075,7 +2076,7 @@ proto_reg_handoff_kerberos(void) kerberos_handle_udp = new_create_dissector_handle(dissect_kerberos_udp, proto_kerberos); - kerberos_handle_tcp = create_dissector_handle(dissect_kerberos_tcp, + kerberos_handle_tcp = new_create_dissector_handle(dissect_kerberos_tcp, proto_kerberos); dissector_add_uint("udp.port", UDP_PORT_KERBEROS, kerberos_handle_udp); |