osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
AndersBroman 2014-04-16 21:58:16 +02:00 committed by Anders Broman
parent 791dd4e128
commit dea68bf00f
6 changed files with 4360 additions and 5008 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
asn1/Makefile.am
View File

@ -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)

2
asn1/Makefile.nmake
View File

@ -69,7 +69,7 @@ BER_LIST= \
idmp \
inap \
isdn-sup \
### kerberos \
kerberos \
ldap \
logotypecertextn \
mms \

5
asn1/kerberos/packet-kerberos-template.c
View File

@ -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);

3
docbook/release-notes.asciidoc
View File

@ -82,11 +82,14 @@ since version 1.10:
* "malformed" display filter has been renamed to "_ws.malformed". A handful of
other filters have been given the "_ws." prefix to note they are Wireshark
application specific filters and not dissector filters.
* The Kerberos dissector has been replaced with an auto generated one from ASN1
protocol description, changing a lot of filter names.
=== Removed dissectors
* The ASN1 plugin has been removed as it's deemed obsolete.
* The GNM dissector has been removed as it was never used.
* The Kerberos hand made dissector has been replaced by one generated from ASN1 code.
=== New Protocol Support

9333
epan/dissectors/packet-kerberos.c
View File

File diff suppressed because it is too large Load Diff

22
epan/dissectors/packet-kerberos.h
View File

@ -1,4 +1,14 @@
/* Do not modify this file. Changes will be overwritten. */
/* Generated automatically by the ASN.1 to Wireshark dissector compiler */
/* packet-kerberos.h */
/* ../../tools/asn2wrs.py -b -p kerberos -c ./kerberos.cnf -s ./packet-kerberos-template -D . -O ../../epan/dissectors KerberosV5Spec2.asn k5.asn */
/* Input file: packet-kerberos-template.h */
#line 1 "../../asn1/kerberos/packet-kerberos-template.h"
/* packet-kerberos.h
* Routines for kerberos packet dissection
* Copyright 2007, Anders Broman <anders.broman@ericsson.com>
*
* Wireshark - Network traffic analyzer
* By Gerald Combs <gerald@wireshark.org>
@ -91,4 +101,14 @@ void read_keytab_file_from_preferences(void);
#endif /* HAVE_KERBEROS */
#endif /* __PACKET_KERBEROS_H */
/*--- Included file: packet-kerberos-exp.h ---*/
#line 1 "../../asn1/kerberos/packet-kerberos-exp.h"
/*--- End of included file: packet-kerberos-exp.h ---*/
#line 98 "../../asn1/kerberos/packet-kerberos-template.h"
#endif /* __PACKET_KERBEROS_H */