Attachment #175674 for bug #213356




# $FreeBSD$

PORTNAME?=	wireshark
PORTVERSION=	2.2.1
PORTREVISION?=	0
CATEGORIES=	net ipv6
MASTER_SITES=	http://www.wireshark.org/download/src/ \

DATADIR=	${PREFIX}/share/${DATADIR_NAME}

GNU_CONFIGURE=	yes
USES=		alias cpe gettext-runtime gmake libtool pathfix perl5 \
		pkgconfig python:build ssl tar:bzip2
USE_PERL5=	build
USE_GNOME=	cairo glib20
CONFIGURE_ARGS+=	--program-transform-name="" \
			--with-ssl=${OPENSSLBASE}
INSTALL_TARGET=	install-strip
USE_LDCONFIG=	yes

LIB_DEPENDS+=	libgpg-error.so:security/libgpg-error

CFLAGS+=	-funit-at-a-time
LIBS+=		-L${LOCALBASE}/lib
PLIST_SUB+=	PORTVERSION=${PORTVERSION}

.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
    reordercap captype
.if defined(LITE)
PKGNAMESUFFIX=		-lite
PLIST_SUB+=		${x:tu}="@comment $x not installed" \

.endif
.endfor

.for x in androiddump randpktdump
.if defined(LITE)
PLIST_SUB+=		${x:tu}="@comment $x not installed" \
			${x:tu}_MAN="@comment $x not installed "
CONFIGURE_ARGS+=	--enable-$x=no
.else
PLIST_SUB+=		${x:tu}=lib/wireshark/extcap/$x \
			${x:tu}_MAN=""
.endif
.endfor

OPTIONS_DEFINE=		RTP SNMP IPV6 GEOIP LUA DECRYPT

OPTIONS_RADIO=		ASYNCDNS GUI


GTK2_USE=	GNOME=gtk20
GTK3_USE=	GNOME=gtk30
QT5_USE=	qt5=core,gui,widgets,printsupport,buildtools_build,linguisttools_build

LUA_USES=		lua:5[1-2]
KRB_BASE_USES=		gssapi

KRB_MIT_USES=		gssapi:mit

RTP_LIB_DEPENDS=	libportaudio.so:audio/portaudio
RTP_CPPFLAGS=		-I${LOCALBASE}/include
SNMP_LIB_DEPENDS=	libsmi.so:net-mgmt/libsmi
ADNS_LIB_DEPENDS=	libadns.so:dns/adns
CARES_LIB_DEPENDS=	libcares.so:dns/c-ares


LUA_CPPFLAGS=		-I${LUA_INCDIR}

QT5_CONFIGURE_ENV=	PATH="${PATH}:${QT_BINDIR}"
QT5_MAKE_ENV=		PATH="${PATH}:${QT_BINDIR}"
QT5_VARS=		PKGNAMESUFFIX=-qt5
QT5_PLIST_SUB=		GUI_GTK="@comment "

Lines 1-3 Link Here

(-)net/wireshark/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1470427617	1	TIMESTAMP = 1476204406
2	SHA256 (wireshark-2.0.5.tar.bz2) = 0ce0241330828973f5b4efee422a3760cab8ce0b41e7721c4b9fd185be1bb10b	2	SHA256 (wireshark-2.2.1.tar.bz2) = 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149
3	SIZE (wireshark-2.0.5.tar.bz2) = 31124989	3	SIZE (wireshark-2.2.1.tar.bz2) = 32154087




--- epan/dissectors/asn1/kerberos/packet-kerberos-template.c.orig	2016-10-04 18:27:46 UTC
+++ epan/dissectors/asn1/kerberos/packet-kerberos-template.c
@@ -809,66 +809,7 @@ decrypt_krb5_data(proto_tree *tree, pack
 #define KRB5_MSG_ENC_KRB_CRED_PART	29	/* EncKrbCredPart */
 #define KRB5_MSG_ERROR			30	/* KRB-ERROR type */
 
-/* encryption type constants */
-#define KRB5_ENCTYPE_NULL		0
-#define KRB5_ENCTYPE_DES_CBC_CRC	1
-#define KRB5_ENCTYPE_DES_CBC_MD4	2
-#define KRB5_ENCTYPE_DES_CBC_MD5	3
-#define KRB5_ENCTYPE_DES_CBC_RAW	4
-#define KRB5_ENCTYPE_DES3_CBC_SHA	5
-#define KRB5_ENCTYPE_DES3_CBC_RAW	6
-#define KRB5_ENCTYPE_DES_HMAC_SHA1	8
-#define KRB5_ENCTYPE_DSA_SHA1_CMS	9
-#define KRB5_ENCTYPE_RSA_MD5_CMS	10
-#define KRB5_ENCTYPE_RSA_SHA1_CMS	11
-#define KRB5_ENCTYPE_RC2_CBC_ENV	12
-#define KRB5_ENCTYPE_RSA_ENV		13
-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV	14
-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV	15
-#define KRB5_ENCTYPE_DES3_CBC_SHA1	16
-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
-#define KRB5_ENCTYPE_DES_CBC_MD5_NT	20
-#define KERB_ENCTYPE_RC4_HMAC		23
-#define KERB_ENCTYPE_RC4_HMAC_EXP	24
-#define KRB5_ENCTYPE_UNKNOWN		0x1ff
-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1	0x7007
-#define KRB5_ENCTYPE_RC4_PLAIN_EXP	0xffffff73
-#define KRB5_ENCTYPE_RC4_PLAIN		0xffffff74
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP	0xffffff78
-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP	0xffffff79
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD	0xffffff7a
-#define KRB5_ENCTYPE_RC4_HMAC_OLD	0xffffff7b
-#define KRB5_ENCTYPE_DES_PLAIN		0xffffff7c
-#define KRB5_ENCTYPE_RC4_SHA		0xffffff7d
-#define KRB5_ENCTYPE_RC4_LM		0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
-#define KRB5_ENCTYPE_RC4_MD4		0xffffff80
-
-/* checksum types */
-#define KRB5_CHKSUM_NONE		0
-#define KRB5_CHKSUM_CRC32		1
-#define KRB5_CHKSUM_MD4			2
-#define KRB5_CHKSUM_KRB_DES_MAC		4
-#define KRB5_CHKSUM_KRB_DES_MAC_K	5
-#define KRB5_CHKSUM_MD5			7
-#define KRB5_CHKSUM_MD5_DES		8
-/* the following four come from packetcable */
-#define KRB5_CHKSUM_MD5_DES3		9
-#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD	12
-#define KRB5_CHKSUM_HMAC_SHA1_DES3	13
-#define KRB5_CHKSUM_SHA1_UNKEYED	14
-#define KRB5_CHKSUM_HMAC_MD5		0xffffff76
-#define KRB5_CHKSUM_MD5_HMAC		0xffffff77
-#define KRB5_CHKSUM_RC4_MD5		0xffffff78
-#define KRB5_CHKSUM_MD25		0xffffff79
-#define KRB5_CHKSUM_DES_MAC_MD5		0xffffff7a
-#define KRB5_CHKSUM_DES_MAC		0xffffff7b
-#define KRB5_CHKSUM_REAL_CRC32		0xffffff7c
-#define KRB5_CHKSUM_SHA1		0xffffff7d
-#define KRB5_CHKSUM_LM			0xffffff7e
 #define KRB5_CHKSUM_GSSAPI		0x8003
-
 /*
  * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
  *
@@ -1164,71 +1105,6 @@ static const value_string krb5_preauthen
 	{ 0                            , NULL },
 };
 
-#if 0
-static const value_string krb5_encryption_types[] = {
-	{ KRB5_ENCTYPE_NULL           , "NULL" },
-	{ KRB5_ENCTYPE_DES_CBC_CRC    , "des-cbc-crc" },
-	{ KRB5_ENCTYPE_DES_CBC_MD4    , "des-cbc-md4" },
-	{ KRB5_ENCTYPE_DES_CBC_MD5    , "des-cbc-md5" },
-	{ KRB5_ENCTYPE_DES_CBC_RAW    , "des-cbc-raw" },
-	{ KRB5_ENCTYPE_DES3_CBC_SHA   , "des3-cbc-sha" },
-	{ KRB5_ENCTYPE_DES3_CBC_RAW   , "des3-cbc-raw" },
-	{ KRB5_ENCTYPE_DES_HMAC_SHA1  , "des-hmac-sha1" },
-	{ KRB5_ENCTYPE_DSA_SHA1_CMS   , "dsa-sha1-cms" },
-	{ KRB5_ENCTYPE_RSA_MD5_CMS    , "rsa-md5-cms" },
-	{ KRB5_ENCTYPE_RSA_SHA1_CMS   , "rsa-sha1-cms" },
-	{ KRB5_ENCTYPE_RC2_CBC_ENV    , "rc2-cbc-env" },
-	{ KRB5_ENCTYPE_RSA_ENV        , "rsa-env" },
-	{ KRB5_ENCTYPE_RSA_ES_OEAP_ENV, "rsa-es-oeap-env" },
-	{ KRB5_ENCTYPE_DES_EDE3_CBC_ENV, "des-ede3-cbc-env" },
-	{ KRB5_ENCTYPE_DES3_CBC_SHA1  , "des3-cbc-sha1" },
-	{ KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96  , "aes128-cts-hmac-sha1-96" },
-	{ KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96  , "aes256-cts-hmac-sha1-96" },
-	{ KRB5_ENCTYPE_DES_CBC_MD5_NT  , "des-cbc-md5-nt" },
-	{ KERB_ENCTYPE_RC4_HMAC       , "rc4-hmac" },
-	{ KERB_ENCTYPE_RC4_HMAC_EXP   , "rc4-hmac-exp" },
-	{ KRB5_ENCTYPE_UNKNOWN        , "unknown" },
-	{ KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1    , "local-des3-hmac-sha1" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_EXP  , "rc4-plain-exp" },
-	{ KRB5_ENCTYPE_RC4_PLAIN      , "rc4-plain" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP, "rc4-plain-old-exp" },
-	{ KRB5_ENCTYPE_RC4_HMAC_OLD_EXP, "rc4-hmac-old-exp" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_OLD  , "rc4-plain-old" },
-	{ KRB5_ENCTYPE_RC4_HMAC_OLD   , "rc4-hmac-old" },
-	{ KRB5_ENCTYPE_DES_PLAIN      , "des-plain" },
-	{ KRB5_ENCTYPE_RC4_SHA        , "rc4-sha" },
-	{ KRB5_ENCTYPE_RC4_LM         , "rc4-lm" },
-	{ KRB5_ENCTYPE_RC4_PLAIN2     , "rc4-plain2" },
-	{ KRB5_ENCTYPE_RC4_MD4        , "rc4-md4" },
-	{ 0                           , NULL },
-};
-
-static const value_string krb5_checksum_types[] = {
-	{ KRB5_CHKSUM_NONE            , "none" },
-	{ KRB5_CHKSUM_CRC32           , "crc32" },
-	{ KRB5_CHKSUM_MD4             , "md4" },
-	{ KRB5_CHKSUM_KRB_DES_MAC     , "krb-des-mac" },
-	{ KRB5_CHKSUM_KRB_DES_MAC_K   , "krb-des-mac-k" },
-	{ KRB5_CHKSUM_MD5             , "md5" },
-	{ KRB5_CHKSUM_MD5_DES         , "md5-des" },
-	{ KRB5_CHKSUM_MD5_DES3        , "md5-des3" },
-	{ KRB5_CHKSUM_HMAC_SHA1_DES3_KD, "hmac-sha1-des3-kd" },
-	{ KRB5_CHKSUM_HMAC_SHA1_DES3  , "hmac-sha1-des3" },
-	{ KRB5_CHKSUM_SHA1_UNKEYED    , "sha1 (unkeyed)" },
-	{ KRB5_CHKSUM_HMAC_MD5        , "hmac-md5" },
-	{ KRB5_CHKSUM_MD5_HMAC        , "md5-hmac" },
-	{ KRB5_CHKSUM_RC4_MD5         , "rc5-md5" },
-	{ KRB5_CHKSUM_MD25            , "md25" },
-	{ KRB5_CHKSUM_DES_MAC_MD5     , "des-mac-md5" },
-	{ KRB5_CHKSUM_DES_MAC         , "des-mac" },
-	{ KRB5_CHKSUM_REAL_CRC32      , "real-crc32" },
-	{ KRB5_CHKSUM_SHA1            , "sha1" },
-	{ KRB5_CHKSUM_LM              , "lm" },
-	{ KRB5_CHKSUM_GSSAPI	  , "gssapi-8003" },
-	{ 0                           , NULL },
-};
-#endif
-
 #define KRB5_AD_IF_RELEVANT			1
 #define KRB5_AD_INTENDED_FOR_SERVER		2
 #define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS	3




--- epan/dissectors/asn1/kerberos/packet-kerberos-template.h.orig	2016-10-04 18:27:46 UTC
+++ epan/dissectors/asn1/kerberos/packet-kerberos-template.h
@@ -100,42 +100,6 @@ void read_keytab_file_from_preferences(v
 
 #endif /* HAVE_KERBEROS */
 
-/* encryption type constants */
-#define KRB5_ENCTYPE_NULL		0
-#define KRB5_ENCTYPE_DES_CBC_CRC	1
-#define KRB5_ENCTYPE_DES_CBC_MD4	2
-#define KRB5_ENCTYPE_DES_CBC_MD5	3
-#define KRB5_ENCTYPE_DES_CBC_RAW	4
-#define KRB5_ENCTYPE_DES3_CBC_SHA	5
-#define KRB5_ENCTYPE_DES3_CBC_RAW	6
-#define KRB5_ENCTYPE_DES_HMAC_SHA1	8
-#define KRB5_ENCTYPE_DSA_SHA1_CMS	9
-#define KRB5_ENCTYPE_RSA_MD5_CMS	10
-#define KRB5_ENCTYPE_RSA_SHA1_CMS	11
-#define KRB5_ENCTYPE_RC2_CBC_ENV	12
-#define KRB5_ENCTYPE_RSA_ENV		13
-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV	14
-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV	15
-#define KRB5_ENCTYPE_DES3_CBC_SHA1	16
-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
-#define KRB5_ENCTYPE_DES_CBC_MD5_NT	20
-#define KERB_ENCTYPE_RC4_HMAC		23
-#define KERB_ENCTYPE_RC4_HMAC_EXP	24
-#define KRB5_ENCTYPE_UNKNOWN		0x1ff
-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1	0x7007
-#define KRB5_ENCTYPE_RC4_PLAIN_EXP	0xffffff73
-#define KRB5_ENCTYPE_RC4_PLAIN		0xffffff74
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP	0xffffff78
-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP	0xffffff79
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD	0xffffff7a
-#define KRB5_ENCTYPE_RC4_HMAC_OLD	0xffffff7b
-#define KRB5_ENCTYPE_DES_PLAIN		0xffffff7c
-#define KRB5_ENCTYPE_RC4_SHA		0xffffff7d
-#define KRB5_ENCTYPE_RC4_LM		0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
-#define KRB5_ENCTYPE_RC4_MD4		0xffffff80
-
 #include "packet-kerberos-exp.h"
 
 #ifdef __cplusplus




--- epan/dissectors/asn1/spnego/packet-spnego-template.c.orig	2016-10-04 18:27:47 UTC
+++ epan/dissectors/asn1/spnego/packet-spnego-template.c
@@ -323,6 +323,9 @@ dissect_spnego_krb5(tvbuff_t *tvb, packe
 #ifndef KEYTYPE_ARCFOUR_56
 # define KEYTYPE_ARCFOUR_56 24
 #endif
+#ifndef KEYTYPE_ARCFOUR_HMAC
+# define KEYTYPE_ARCFOUR_HMAC 23
+#endif
 /* XXX - We should probably do a configure-time check for this instead */
 #ifndef KRB5_KU_USAGE_SEAL
 # define KRB5_KU_USAGE_SEAL 22
@@ -847,7 +850,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *
 			decrypt_gssapi_krb_arcfour_wrap(tree,
 				pinfo,
 				tvb,
-				KERB_ENCTYPE_RC4_HMAC,
+				KEYTYPE_ARCFOUR_HMAC,
 				gssapi_encrypt);
 #endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */
 		}




--- epan/dissectors/packet-kerberos.c.orig	2016-10-04 18:27:49 UTC
+++ epan/dissectors/packet-kerberos.c
@@ -1068,66 +1068,7 @@ decrypt_krb5_data(proto_tree *tree, pack
 #define KRB5_MSG_ENC_KRB_CRED_PART	29	/* EncKrbCredPart */
 #define KRB5_MSG_ERROR			30	/* KRB-ERROR type */
 
-/* encryption type constants */
-#define KRB5_ENCTYPE_NULL		0
-#define KRB5_ENCTYPE_DES_CBC_CRC	1
-#define KRB5_ENCTYPE_DES_CBC_MD4	2
-#define KRB5_ENCTYPE_DES_CBC_MD5	3
-#define KRB5_ENCTYPE_DES_CBC_RAW	4
-#define KRB5_ENCTYPE_DES3_CBC_SHA	5
-#define KRB5_ENCTYPE_DES3_CBC_RAW	6
-#define KRB5_ENCTYPE_DES_HMAC_SHA1	8
-#define KRB5_ENCTYPE_DSA_SHA1_CMS	9
-#define KRB5_ENCTYPE_RSA_MD5_CMS	10
-#define KRB5_ENCTYPE_RSA_SHA1_CMS	11
-#define KRB5_ENCTYPE_RC2_CBC_ENV	12
-#define KRB5_ENCTYPE_RSA_ENV		13
-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV	14
-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV	15
-#define KRB5_ENCTYPE_DES3_CBC_SHA1	16
-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
-#define KRB5_ENCTYPE_DES_CBC_MD5_NT	20
-#define KERB_ENCTYPE_RC4_HMAC		23
-#define KERB_ENCTYPE_RC4_HMAC_EXP	24
-#define KRB5_ENCTYPE_UNKNOWN		0x1ff
-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1	0x7007
-#define KRB5_ENCTYPE_RC4_PLAIN_EXP	0xffffff73
-#define KRB5_ENCTYPE_RC4_PLAIN		0xffffff74
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP	0xffffff78
-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP	0xffffff79
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD	0xffffff7a
-#define KRB5_ENCTYPE_RC4_HMAC_OLD	0xffffff7b
-#define KRB5_ENCTYPE_DES_PLAIN		0xffffff7c
-#define KRB5_ENCTYPE_RC4_SHA		0xffffff7d
-#define KRB5_ENCTYPE_RC4_LM		0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
-#define KRB5_ENCTYPE_RC4_MD4		0xffffff80
-
-/* checksum types */
-#define KRB5_CHKSUM_NONE		0
-#define KRB5_CHKSUM_CRC32		1
-#define KRB5_CHKSUM_MD4			2
-#define KRB5_CHKSUM_KRB_DES_MAC		4
-#define KRB5_CHKSUM_KRB_DES_MAC_K	5
-#define KRB5_CHKSUM_MD5			7
-#define KRB5_CHKSUM_MD5_DES		8
-/* the following four come from packetcable */
-#define KRB5_CHKSUM_MD5_DES3		9
-#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD	12
-#define KRB5_CHKSUM_HMAC_SHA1_DES3	13
-#define KRB5_CHKSUM_SHA1_UNKEYED	14
-#define KRB5_CHKSUM_HMAC_MD5		0xffffff76
-#define KRB5_CHKSUM_MD5_HMAC		0xffffff77
-#define KRB5_CHKSUM_RC4_MD5		0xffffff78
-#define KRB5_CHKSUM_MD25		0xffffff79
-#define KRB5_CHKSUM_DES_MAC_MD5		0xffffff7a
-#define KRB5_CHKSUM_DES_MAC		0xffffff7b
-#define KRB5_CHKSUM_REAL_CRC32		0xffffff7c
-#define KRB5_CHKSUM_SHA1		0xffffff7d
-#define KRB5_CHKSUM_LM			0xffffff7e
 #define KRB5_CHKSUM_GSSAPI		0x8003
-
 /*
  * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
  *
@@ -1423,71 +1364,6 @@ static const value_string krb5_preauthen
 	{ 0                            , NULL },
 };
 
-#if 0
-static const value_string krb5_encryption_types[] = {
-	{ KRB5_ENCTYPE_NULL           , "NULL" },
-	{ KRB5_ENCTYPE_DES_CBC_CRC    , "des-cbc-crc" },
-	{ KRB5_ENCTYPE_DES_CBC_MD4    , "des-cbc-md4" },
-	{ KRB5_ENCTYPE_DES_CBC_MD5    , "des-cbc-md5" },
-	{ KRB5_ENCTYPE_DES_CBC_RAW    , "des-cbc-raw" },
-	{ KRB5_ENCTYPE_DES3_CBC_SHA   , "des3-cbc-sha" },
-	{ KRB5_ENCTYPE_DES3_CBC_RAW   , "des3-cbc-raw" },
-	{ KRB5_ENCTYPE_DES_HMAC_SHA1  , "des-hmac-sha1" },
-	{ KRB5_ENCTYPE_DSA_SHA1_CMS   , "dsa-sha1-cms" },
-	{ KRB5_ENCTYPE_RSA_MD5_CMS    , "rsa-md5-cms" },
-	{ KRB5_ENCTYPE_RSA_SHA1_CMS   , "rsa-sha1-cms" },
-	{ KRB5_ENCTYPE_RC2_CBC_ENV    , "rc2-cbc-env" },
-	{ KRB5_ENCTYPE_RSA_ENV        , "rsa-env" },
-	{ KRB5_ENCTYPE_RSA_ES_OEAP_ENV, "rsa-es-oeap-env" },
-	{ KRB5_ENCTYPE_DES_EDE3_CBC_ENV, "des-ede3-cbc-env" },
-	{ KRB5_ENCTYPE_DES3_CBC_SHA1  , "des3-cbc-sha1" },
-	{ KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96  , "aes128-cts-hmac-sha1-96" },
-	{ KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96  , "aes256-cts-hmac-sha1-96" },
-	{ KRB5_ENCTYPE_DES_CBC_MD5_NT  , "des-cbc-md5-nt" },
-	{ KERB_ENCTYPE_RC4_HMAC       , "rc4-hmac" },
-	{ KERB_ENCTYPE_RC4_HMAC_EXP   , "rc4-hmac-exp" },
-	{ KRB5_ENCTYPE_UNKNOWN        , "unknown" },
-	{ KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1    , "local-des3-hmac-sha1" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_EXP  , "rc4-plain-exp" },
-	{ KRB5_ENCTYPE_RC4_PLAIN      , "rc4-plain" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP, "rc4-plain-old-exp" },
-	{ KRB5_ENCTYPE_RC4_HMAC_OLD_EXP, "rc4-hmac-old-exp" },
-	{ KRB5_ENCTYPE_RC4_PLAIN_OLD  , "rc4-plain-old" },
-	{ KRB5_ENCTYPE_RC4_HMAC_OLD   , "rc4-hmac-old" },
-	{ KRB5_ENCTYPE_DES_PLAIN      , "des-plain" },
-	{ KRB5_ENCTYPE_RC4_SHA        , "rc4-sha" },
-	{ KRB5_ENCTYPE_RC4_LM         , "rc4-lm" },
-	{ KRB5_ENCTYPE_RC4_PLAIN2     , "rc4-plain2" },
-	{ KRB5_ENCTYPE_RC4_MD4        , "rc4-md4" },
-	{ 0                           , NULL },
-};
-
-static const value_string krb5_checksum_types[] = {
-	{ KRB5_CHKSUM_NONE            , "none" },
-	{ KRB5_CHKSUM_CRC32           , "crc32" },
-	{ KRB5_CHKSUM_MD4             , "md4" },
-	{ KRB5_CHKSUM_KRB_DES_MAC     , "krb-des-mac" },
-	{ KRB5_CHKSUM_KRB_DES_MAC_K   , "krb-des-mac-k" },
-	{ KRB5_CHKSUM_MD5             , "md5" },
-	{ KRB5_CHKSUM_MD5_DES         , "md5-des" },
-	{ KRB5_CHKSUM_MD5_DES3        , "md5-des3" },
-	{ KRB5_CHKSUM_HMAC_SHA1_DES3_KD, "hmac-sha1-des3-kd" },
-	{ KRB5_CHKSUM_HMAC_SHA1_DES3  , "hmac-sha1-des3" },
-	{ KRB5_CHKSUM_SHA1_UNKEYED    , "sha1 (unkeyed)" },
-	{ KRB5_CHKSUM_HMAC_MD5        , "hmac-md5" },
-	{ KRB5_CHKSUM_MD5_HMAC        , "md5-hmac" },
-	{ KRB5_CHKSUM_RC4_MD5         , "rc5-md5" },
-	{ KRB5_CHKSUM_MD25            , "md25" },
-	{ KRB5_CHKSUM_DES_MAC_MD5     , "des-mac-md5" },
-	{ KRB5_CHKSUM_DES_MAC         , "des-mac" },
-	{ KRB5_CHKSUM_REAL_CRC32      , "real-crc32" },
-	{ KRB5_CHKSUM_SHA1            , "sha1" },
-	{ KRB5_CHKSUM_LM              , "lm" },
-	{ KRB5_CHKSUM_GSSAPI	  , "gssapi-8003" },
-	{ 0                           , NULL },
-};
-#endif
-
 #define KRB5_AD_IF_RELEVANT			1
 #define KRB5_AD_INTENDED_FOR_SERVER		2
 #define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS	3
@@ -4341,7 +4217,7 @@ dissect_kerberos_ChangePasswdData(gboole
 
 
 /*--- End of included file: packet-kerberos-fn.c ---*/
-#line 1985 "./asn1/kerberos/packet-kerberos-template.c"
+#line 1861 "./asn1/kerberos/packet-kerberos-template.c"
 
 /* Make wrappers around exported functions for now */
 int
@@ -5395,7 +5271,7 @@ void proto_register_kerberos(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-kerberos-hfarr.c ---*/
-#line 2366 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2242 "./asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	/* List of subtrees */
@@ -5473,7 +5349,7 @@ void proto_register_kerberos(void) {
     &ett_kerberos_ChangePasswdData,
 
 /*--- End of included file: packet-kerberos-ettarr.c ---*/
-#line 2382 "./asn1/kerberos/packet-kerberos-template.c"
+#line 2258 "./asn1/kerberos/packet-kerberos-template.c"
 	};
 
 	static ei_register_info ei[] = {




--- epan/dissectors/packet-kerberos.h.orig	2016-10-04 18:27:49 UTC
+++ epan/dissectors/packet-kerberos.h
@@ -108,42 +108,6 @@ void read_keytab_file_from_preferences(v
 
 #endif /* HAVE_KERBEROS */
 
-/* encryption type constants */
-#define KRB5_ENCTYPE_NULL		0
-#define KRB5_ENCTYPE_DES_CBC_CRC	1
-#define KRB5_ENCTYPE_DES_CBC_MD4	2
-#define KRB5_ENCTYPE_DES_CBC_MD5	3
-#define KRB5_ENCTYPE_DES_CBC_RAW	4
-#define KRB5_ENCTYPE_DES3_CBC_SHA	5
-#define KRB5_ENCTYPE_DES3_CBC_RAW	6
-#define KRB5_ENCTYPE_DES_HMAC_SHA1	8
-#define KRB5_ENCTYPE_DSA_SHA1_CMS	9
-#define KRB5_ENCTYPE_RSA_MD5_CMS	10
-#define KRB5_ENCTYPE_RSA_SHA1_CMS	11
-#define KRB5_ENCTYPE_RC2_CBC_ENV	12
-#define KRB5_ENCTYPE_RSA_ENV		13
-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV	14
-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV	15
-#define KRB5_ENCTYPE_DES3_CBC_SHA1	16
-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
-#define KRB5_ENCTYPE_DES_CBC_MD5_NT	20
-#define KERB_ENCTYPE_RC4_HMAC		23
-#define KERB_ENCTYPE_RC4_HMAC_EXP	24
-#define KRB5_ENCTYPE_UNKNOWN		0x1ff
-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1	0x7007
-#define KRB5_ENCTYPE_RC4_PLAIN_EXP	0xffffff73
-#define KRB5_ENCTYPE_RC4_PLAIN		0xffffff74
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP	0xffffff78
-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP	0xffffff79
-#define KRB5_ENCTYPE_RC4_PLAIN_OLD	0xffffff7a
-#define KRB5_ENCTYPE_RC4_HMAC_OLD	0xffffff7b
-#define KRB5_ENCTYPE_DES_PLAIN		0xffffff7c
-#define KRB5_ENCTYPE_RC4_SHA		0xffffff7d
-#define KRB5_ENCTYPE_RC4_LM		0xffffff7e
-#define KRB5_ENCTYPE_RC4_PLAIN2		0xffffff7f
-#define KRB5_ENCTYPE_RC4_MD4		0xffffff80
-
 
 /*--- Included file: packet-kerberos-exp.h ---*/
 #line 1 "./asn1/kerberos/packet-kerberos-exp.h"
@@ -170,7 +134,7 @@ void read_keytab_file_from_preferences(v
 int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_);
 
 /*--- End of included file: packet-kerberos-exp.h ---*/
-#line 140 "./asn1/kerberos/packet-kerberos-template.h"
+#line 104 "./asn1/kerberos/packet-kerberos-template.h"
 
 #ifdef __cplusplus
 }




--- epan/dissectors/packet-spnego.c.orig	2016-10-04 18:27:52 UTC
+++ epan/dissectors/packet-spnego.c
@@ -775,6 +775,9 @@ dissect_spnego_krb5(tvbuff_t *tvb, packe
 #ifndef KEYTYPE_ARCFOUR_56
 # define KEYTYPE_ARCFOUR_56 24
 #endif
+#ifndef KEYTYPE_ARCFOUR_HMAC
+# define KEYTYPE_ARCFOUR_HMAC 23
+#endif
 /* XXX - We should probably do a configure-time check for this instead */
 #ifndef KRB5_KU_USAGE_SEAL
 # define KRB5_KU_USAGE_SEAL 22
@@ -1299,7 +1302,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *
 			decrypt_gssapi_krb_arcfour_wrap(tree,
 				pinfo,
 				tvb,
-				KERB_ENCTYPE_RC4_HMAC,
+				KEYTYPE_ARCFOUR_HMAC,
 				gssapi_encrypt);
 #endif /* HAVE_HEIMDAL_KERBEROS || HAVE_MIT_KERBEROS */
 		}
@@ -1966,7 +1969,7 @@ void proto_register_spnego(void) {
         NULL, HFILL }},
 
 /*--- End of included file: packet-spnego-hfarr.c ---*/
-#line 1421 "./asn1/spnego/packet-spnego-template.c"
+#line 1424 "./asn1/spnego/packet-spnego-template.c"
 	};
 
 	/* List of subtrees */
@@ -1989,7 +1992,7 @@ void proto_register_spnego(void) {
     &ett_spnego_InitialContextToken_U,
 
 /*--- End of included file: packet-spnego-ettarr.c ---*/
-#line 1431 "./asn1/spnego/packet-spnego-template.c"
+#line 1434 "./asn1/spnego/packet-spnego-template.c"
 	};
 
 	static ei_register_info ei[] = {

Lines 2-7 Link Here

(-)net/wireshark/pkg-plist (-6 / +19 lines)
2	%%CAPINFOS%%	2	%%CAPINFOS%%
3	%%CAPTYPE%%	3	%%CAPTYPE%%
4	%%DFTEST%%	4	%%DFTEST%%
		5	%%RANDPKTDUMP%%
5	@group network	6	@group network
6	@mode 2555	7	@mode 2555
7	bin/dumpcap	8	bin/dumpcap
Lines 17-30 Link Here
17	bin/tshark	18	bin/tshark
18	%%TEXT2PCAP%%	19	%%TEXT2PCAP%%
19	lib/libwireshark.so	20	lib/libwireshark.so
20	lib/libwireshark.so.6	21	lib/libwireshark.so.8
21	lib/libwireshark.so.6.1.5	22	lib/libwireshark.so.8.0.1
22	lib/libwiretap.so	23	lib/libwiretap.so
23	lib/libwiretap.so.5	24	lib/libwiretap.so.6
24	lib/libwiretap.so.5.0.5	25	lib/libwiretap.so.6.0.1
		26	lib/libwscodecs.so
		27	lib/libwscodecs.so.1
		28	lib/libwscodecs.so.1.0.0
25	lib/libwsutil.so	29	lib/libwsutil.so
26	lib/libwsutil.so.6	30	lib/libwsutil.so.7
27	lib/libwsutil.so.6.0.0	31	lib/libwsutil.so.7.0.0
28	lib/wireshark/plugins/%%PORTVERSION%%/docsis.so	32	lib/wireshark/plugins/%%PORTVERSION%%/docsis.so
29	lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so	33	lib/wireshark/plugins/%%PORTVERSION%%/ethercat.so
30	lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so	34	lib/wireshark/plugins/%%PORTVERSION%%/gryphon.so
Lines 38-43 Link Here
38	lib/wireshark/plugins/%%PORTVERSION%%/wimax.so	42	lib/wireshark/plugins/%%PORTVERSION%%/wimax.so
39	lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so	43	lib/wireshark/plugins/%%PORTVERSION%%/wimaxasncp.so
40	lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so	44	lib/wireshark/plugins/%%PORTVERSION%%/wimaxmacphy.so
		45	libdata/pkgconfig/wireshark.pc
41	%%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz	46	%%ANDROIDDUMP_MAN%%man/man1/androiddump.1.gz
42	%%CAPINFOS_MAN%%man/man1/capinfos.1.gz	47	%%CAPINFOS_MAN%%man/man1/capinfos.1.gz
43	man/man1/dumpcap.1.gz	48	man/man1/dumpcap.1.gz
Lines 47-55 Link Here
47	%%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz	52	%%TEXT2PCAP_MAN%%man/man1/text2pcap.1.gz
48	%%DFTEST_MAN%%man/man1/dftest.1.gz	53	%%DFTEST_MAN%%man/man1/dftest.1.gz
49	%%RANDPKT_MAN%%man/man1/randpkt.1.gz	54	%%RANDPKT_MAN%%man/man1/randpkt.1.gz
		55	%%RANDPKTDUMP_MAN%%man/man1/randpktdump.1.gz
50	%%REORDERCAP_MAN%%man/man1/reordercap.1.gz	56	%%REORDERCAP_MAN%%man/man1/reordercap.1.gz
51	man/man1/tshark.1.gz	57	man/man1/tshark.1.gz
52	%%GUI%%man/man1/wireshark.1.gz	58	%%GUI%%man/man1/wireshark.1.gz
		59	man/man4/extcap.4.gz
53	man/man4/wireshark-filter.4.gz	60	man/man4/wireshark-filter.4.gz
54	%%GUI%%share/appdata/wireshark.appdata.xml	61	%%GUI%%share/appdata/wireshark.appdata.xml
55	%%GUI%%share/applications/wireshark.desktop	62	%%GUI%%share/applications/wireshark.desktop
Lines 75-80 Link Here
75	%%DATADIR%%/androiddump.html	82	%%DATADIR%%/androiddump.html
76	%%DATADIR%%/capinfos.html	83	%%DATADIR%%/capinfos.html
77	%%DATADIR%%/cfilters	84	%%DATADIR%%/cfilters
		85	%%DATADIR%%/ciscodump.html
78	%%DATADIR%%/colorfilters	86	%%DATADIR%%/colorfilters
79	%%LUA%%%%DATADIR%%/console.lua	87	%%LUA%%%%DATADIR%%/console.lua
80	%%DATADIR%%/dfilters	88	%%DATADIR%%/dfilters
Lines 83-88 Link Here
83	%%DATADIR%%/dumpcap.html	91	%%DATADIR%%/dumpcap.html
84	%%DATADIR%%/diameter/AlcatelLucent.xml	92	%%DATADIR%%/diameter/AlcatelLucent.xml
85	%%DATADIR%%/diameter/Cisco.xml	93	%%DATADIR%%/diameter/Cisco.xml
		94	%%DATADIR%%/diameter/CiscoSystems.xml
86	%%DATADIR%%/diameter/Custom.xml	95	%%DATADIR%%/diameter/Custom.xml
87	%%DATADIR%%/diameter/Ericsson.xml	96	%%DATADIR%%/diameter/Ericsson.xml
88	%%DATADIR%%/diameter/HP.xml	97	%%DATADIR%%/diameter/HP.xml
Lines 116-121 Link Here
116	%%DATADIR%%/dtds/xcap-caps.dtd	125	%%DATADIR%%/dtds/xcap-caps.dtd
117	%%DATADIR%%/dtds/xcap-error.dtd	126	%%DATADIR%%/dtds/xcap-error.dtd
118	%%DATADIR%%/editcap.html	127	%%DATADIR%%/editcap.html
		128	%%DATADIR%%/extcap.html
119	%%LUA%%%%DATADIR%%/init.lua	129	%%LUA%%%%DATADIR%%/init.lua
120	%%DATADIR%%/help/capture_filters.txt	130	%%DATADIR%%/help/capture_filters.txt
121	%%DATADIR%%/help/capturing.txt	131	%%DATADIR%%/help/capturing.txt
Lines 290-295 Link Here
290	%%DATADIR%%/radius/dictionary.roaringpenguin	300	%%DATADIR%%/radius/dictionary.roaringpenguin
291	%%DATADIR%%/radius/dictionary.ruckus	301	%%DATADIR%%/radius/dictionary.ruckus
292	%%DATADIR%%/radius/dictionary.ruggedcom	302	%%DATADIR%%/radius/dictionary.ruggedcom
		303	%%DATADIR%%/radius/dictionary.sangoma
293	%%DATADIR%%/radius/dictionary.sg	304	%%DATADIR%%/radius/dictionary.sg
294	%%DATADIR%%/radius/dictionary.shasta	305	%%DATADIR%%/radius/dictionary.shasta
295	%%DATADIR%%/radius/dictionary.shiva	306	%%DATADIR%%/radius/dictionary.shiva
Lines 330-339 Link Here
330	%%DATADIR%%/radius/dictionary.zte	341	%%DATADIR%%/radius/dictionary.zte
331	%%DATADIR%%/radius/dictionary.zyxel	342	%%DATADIR%%/radius/dictionary.zyxel
332	%%DATADIR%%/randpkt.html	343	%%DATADIR%%/randpkt.html
		344	%%DATADIR%%/randpktdump.html
333	%%DATADIR%%/rawshark.html	345	%%DATADIR%%/rawshark.html
334	%%DATADIR%%/reordercap.html	346	%%DATADIR%%/reordercap.html
335	%%DATADIR%%/services	347	%%DATADIR%%/services
336	%%DATADIR%%/smi_modules	348	%%DATADIR%%/smi_modules
		349	%%DATADIR%%/sshdump.html
337	%%DATADIR%%/tshark.html	350	%%DATADIR%%/tshark.html
338	%%DATADIR%%/text2pcap.html	351	%%DATADIR%%/text2pcap.html
339	%%DATADIR%%/tpncp/tpncp.dat	352	%%DATADIR%%/tpncp/tpncp.dat

Return to bug 213356

Lines 2-8 Link Here

(-)net/wireshark/Makefile (-5 / +21 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME?= wireshark	4	PORTNAME?= wireshark
5	PORTVERSION= 2.0.5	5	PORTVERSION= 2.2.1
6	PORTREVISION?= 0	6	PORTREVISION?= 0
7	CATEGORIES= net ipv6	7	CATEGORIES= net ipv6
8	MASTER_SITES= http://www.wireshark.org/download/src/ \	8	MASTER_SITES= http://www.wireshark.org/download/src/ \
Lines 27-46 Link Here
27	DATADIR= ${PREFIX}/share/${DATADIR_NAME}	27	DATADIR= ${PREFIX}/share/${DATADIR_NAME}
28		28
29	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
30	USES= alias cpe gmake libtool perl5 pkgconfig python:build ssl tar:bzip2	30	USES= alias cpe gettext-runtime gmake libtool pathfix perl5 \
		31	pkgconfig python:build ssl tar:bzip2
31	USE_PERL5= build	32	USE_PERL5= build
32	USE_GNOME= glib20	33	USE_GNOME= cairo glib20
33	CONFIGURE_ARGS+= --program-transform-name="" \	34	CONFIGURE_ARGS+= --program-transform-name="" \
34	--with-ssl=${OPENSSLBASE}	35	--with-ssl=${OPENSSLBASE}
35	INSTALL_TARGET= install-strip	36	INSTALL_TARGET= install-strip
36	USE_LDCONFIG= yes	37	USE_LDCONFIG= yes
37		38
		39	LIB_DEPENDS+= libgpg-error.so:security/libgpg-error
		40
38	CFLAGS+= -funit-at-a-time	41	CFLAGS+= -funit-at-a-time
39	LIBS+= -L${LOCALBASE}/lib	42	LIBS+= -L${LOCALBASE}/lib
40	PLIST_SUB+= PORTVERSION=${PORTVERSION}	43	PLIST_SUB+= PORTVERSION=${PORTVERSION}
41		44
42	.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \	45	.for x in capinfos editcap mergecap rawshark text2pcap dftest randpkt \
43	reordercap captype androiddump	46	reordercap captype
44	.if defined(LITE)	47	.if defined(LITE)
45	PKGNAMESUFFIX= -lite	48	PKGNAMESUFFIX= -lite
46	PLIST_SUB+= ${x:tu}="@comment $x not installed" \	49	PLIST_SUB+= ${x:tu}="@comment $x not installed" \
Lines 53-58 Link Here
53	.endif	56	.endif
54	.endfor	57	.endfor
55		58
		59	.for x in androiddump randpktdump
		60	.if defined(LITE)
		61	PLIST_SUB+= ${x:tu}="@comment $x not installed" \
		62	${x:tu}_MAN="@comment $x not installed "
		63	CONFIGURE_ARGS+= --enable-$x=no
		64	.else
		65	PLIST_SUB+= ${x:tu}=lib/wireshark/extcap/$x \
		66	${x:tu}_MAN=""
		67	.endif
		68	.endfor
		69
56	OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT	70	OPTIONS_DEFINE= RTP SNMP IPV6 GEOIP LUA DECRYPT
57		71
58	OPTIONS_RADIO= ASYNCDNS GUI	72	OPTIONS_RADIO= ASYNCDNS GUI
Lines 76-82 Link Here
76		90
77	GTK2_USE= GNOME=gtk20	91	GTK2_USE= GNOME=gtk20
78	GTK3_USE= GNOME=gtk30	92	GTK3_USE= GNOME=gtk30
79	QT5_USE= QT5=core,gui,widgets,printsupport,buildtools_build	93	QT5_USE= qt5=core,gui,widgets,printsupport,buildtools_build,linguisttools_build
80		94
81	LUA_USES= lua:5[1-2]	95	LUA_USES= lua:5[1-2]
82	KRB_BASE_USES= gssapi	96	KRB_BASE_USES= gssapi
Lines 84-89 Link Here
84	KRB_MIT_USES= gssapi:mit	98	KRB_MIT_USES= gssapi:mit
85		99
86	RTP_LIB_DEPENDS= libportaudio.so:audio/portaudio	100	RTP_LIB_DEPENDS= libportaudio.so:audio/portaudio
		101	RTP_CPPFLAGS= -I${LOCALBASE}/include
87	SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi	102	SNMP_LIB_DEPENDS= libsmi.so:net-mgmt/libsmi
88	ADNS_LIB_DEPENDS= libadns.so:dns/adns	103	ADNS_LIB_DEPENDS= libadns.so:dns/adns
89	CARES_LIB_DEPENDS= libcares.so:dns/c-ares	104	CARES_LIB_DEPENDS= libcares.so:dns/c-ares
Lines 110-115 Link Here
110		125
111	LUA_CPPFLAGS= -I${LUA_INCDIR}	126	LUA_CPPFLAGS= -I${LUA_INCDIR}
112		127
		128	QT5_CONFIGURE_ENV= PATH="${PATH}:${QT_BINDIR}"
113	QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}"	129	QT5_MAKE_ENV= PATH="${PATH}:${QT_BINDIR}"
114	QT5_VARS= PKGNAMESUFFIX=-qt5	130	QT5_VARS= PKGNAMESUFFIX=-qt5
115	QT5_PLIST_SUB= GUI_GTK="@comment "	131	QT5_PLIST_SUB= GUI_GTK="@comment "

Line 0 Link Here

(-)net/wireshark/files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.c (+141 lines)
		1	--- epan/dissectors/asn1/kerberos/packet-kerberos-template.c.orig 2016-10-04 18:27:46 UTC
		2	+++ epan/dissectors/asn1/kerberos/packet-kerberos-template.c
		3	@@ -809,66 +809,7 @@ decrypt_krb5_data(proto_tree *tree, pack
		4	#define KRB5_MSG_ENC_KRB_CRED_PART 29 /* EncKrbCredPart */
		5	#define KRB5_MSG_ERROR 30 /* KRB-ERROR type */
		6
		7	-/* encryption type constants */
		8	-#define KRB5_ENCTYPE_NULL 0
		9	-#define KRB5_ENCTYPE_DES_CBC_CRC 1
		10	-#define KRB5_ENCTYPE_DES_CBC_MD4 2
		11	-#define KRB5_ENCTYPE_DES_CBC_MD5 3
		12	-#define KRB5_ENCTYPE_DES_CBC_RAW 4
		13	-#define KRB5_ENCTYPE_DES3_CBC_SHA 5
		14	-#define KRB5_ENCTYPE_DES3_CBC_RAW 6
		15	-#define KRB5_ENCTYPE_DES_HMAC_SHA1 8
		16	-#define KRB5_ENCTYPE_DSA_SHA1_CMS 9
		17	-#define KRB5_ENCTYPE_RSA_MD5_CMS 10
		18	-#define KRB5_ENCTYPE_RSA_SHA1_CMS 11
		19	-#define KRB5_ENCTYPE_RC2_CBC_ENV 12
		20	-#define KRB5_ENCTYPE_RSA_ENV 13
		21	-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14
		22	-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
		23	-#define KRB5_ENCTYPE_DES3_CBC_SHA1 16
		24	-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
		25	-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
		26	-#define KRB5_ENCTYPE_DES_CBC_MD5_NT 20
		27	-#define KERB_ENCTYPE_RC4_HMAC 23
		28	-#define KERB_ENCTYPE_RC4_HMAC_EXP 24
		29	-#define KRB5_ENCTYPE_UNKNOWN 0x1ff
		30	-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 0x7007
		31	-#define KRB5_ENCTYPE_RC4_PLAIN_EXP 0xffffff73
		32	-#define KRB5_ENCTYPE_RC4_PLAIN 0xffffff74
		33	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP 0xffffff78
		34	-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP 0xffffff79
		35	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD 0xffffff7a
		36	-#define KRB5_ENCTYPE_RC4_HMAC_OLD 0xffffff7b
		37	-#define KRB5_ENCTYPE_DES_PLAIN 0xffffff7c
		38	-#define KRB5_ENCTYPE_RC4_SHA 0xffffff7d
		39	-#define KRB5_ENCTYPE_RC4_LM 0xffffff7e
		40	-#define KRB5_ENCTYPE_RC4_PLAIN2 0xffffff7f
		41	-#define KRB5_ENCTYPE_RC4_MD4 0xffffff80
		42	-
		43	-/* checksum types */
		44	-#define KRB5_CHKSUM_NONE 0
		45	-#define KRB5_CHKSUM_CRC32 1
		46	-#define KRB5_CHKSUM_MD4 2
		47	-#define KRB5_CHKSUM_KRB_DES_MAC 4
		48	-#define KRB5_CHKSUM_KRB_DES_MAC_K 5
		49	-#define KRB5_CHKSUM_MD5 7
		50	-#define KRB5_CHKSUM_MD5_DES 8
		51	-/* the following four come from packetcable */
		52	-#define KRB5_CHKSUM_MD5_DES3 9
		53	-#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD 12
		54	-#define KRB5_CHKSUM_HMAC_SHA1_DES3 13
		55	-#define KRB5_CHKSUM_SHA1_UNKEYED 14
		56	-#define KRB5_CHKSUM_HMAC_MD5 0xffffff76
		57	-#define KRB5_CHKSUM_MD5_HMAC 0xffffff77
		58	-#define KRB5_CHKSUM_RC4_MD5 0xffffff78
		59	-#define KRB5_CHKSUM_MD25 0xffffff79
		60	-#define KRB5_CHKSUM_DES_MAC_MD5 0xffffff7a
		61	-#define KRB5_CHKSUM_DES_MAC 0xffffff7b
		62	-#define KRB5_CHKSUM_REAL_CRC32 0xffffff7c
		63	-#define KRB5_CHKSUM_SHA1 0xffffff7d
		64	-#define KRB5_CHKSUM_LM 0xffffff7e
65	#define KRB5_CHKSUM_GSSAPI 0x8003
66	-
67	/*
68	* For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
69	*
70	@@ -1164,71 +1105,6 @@ static const value_string krb5_preauthen
71	{ 0 , NULL },
72	};
73
74	-#if 0
75	-static const value_string krb5_encryption_types[] = {
76	- { KRB5_ENCTYPE_NULL , "NULL" },
77	- { KRB5_ENCTYPE_DES_CBC_CRC , "des-cbc-crc" },
78	- { KRB5_ENCTYPE_DES_CBC_MD4 , "des-cbc-md4" },
79	- { KRB5_ENCTYPE_DES_CBC_MD5 , "des-cbc-md5" },
80	- { KRB5_ENCTYPE_DES_CBC_RAW , "des-cbc-raw" },
81	- { KRB5_ENCTYPE_DES3_CBC_SHA , "des3-cbc-sha" },
82	- { KRB5_ENCTYPE_DES3_CBC_RAW , "des3-cbc-raw" },
83	- { KRB5_ENCTYPE_DES_HMAC_SHA1 , "des-hmac-sha1" },
84	- { KRB5_ENCTYPE_DSA_SHA1_CMS , "dsa-sha1-cms" },
85	- { KRB5_ENCTYPE_RSA_MD5_CMS , "rsa-md5-cms" },
86	- { KRB5_ENCTYPE_RSA_SHA1_CMS , "rsa-sha1-cms" },
87	- { KRB5_ENCTYPE_RC2_CBC_ENV , "rc2-cbc-env" },
88	- { KRB5_ENCTYPE_RSA_ENV , "rsa-env" },
89	- { KRB5_ENCTYPE_RSA_ES_OEAP_ENV, "rsa-es-oeap-env" },
90	- { KRB5_ENCTYPE_DES_EDE3_CBC_ENV, "des-ede3-cbc-env" },
91	- { KRB5_ENCTYPE_DES3_CBC_SHA1 , "des3-cbc-sha1" },
92	- { KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 , "aes128-cts-hmac-sha1-96" },
93	- { KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 , "aes256-cts-hmac-sha1-96" },
94	- { KRB5_ENCTYPE_DES_CBC_MD5_NT , "des-cbc-md5-nt" },
95	- { KERB_ENCTYPE_RC4_HMAC , "rc4-hmac" },
96	- { KERB_ENCTYPE_RC4_HMAC_EXP , "rc4-hmac-exp" },
97	- { KRB5_ENCTYPE_UNKNOWN , "unknown" },
98	- { KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 , "local-des3-hmac-sha1" },
99	- { KRB5_ENCTYPE_RC4_PLAIN_EXP , "rc4-plain-exp" },
100	- { KRB5_ENCTYPE_RC4_PLAIN , "rc4-plain" },
101	- { KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP, "rc4-plain-old-exp" },
102	- { KRB5_ENCTYPE_RC4_HMAC_OLD_EXP, "rc4-hmac-old-exp" },
103	- { KRB5_ENCTYPE_RC4_PLAIN_OLD , "rc4-plain-old" },
104	- { KRB5_ENCTYPE_RC4_HMAC_OLD , "rc4-hmac-old" },
105	- { KRB5_ENCTYPE_DES_PLAIN , "des-plain" },
106	- { KRB5_ENCTYPE_RC4_SHA , "rc4-sha" },
107	- { KRB5_ENCTYPE_RC4_LM , "rc4-lm" },
108	- { KRB5_ENCTYPE_RC4_PLAIN2 , "rc4-plain2" },
109	- { KRB5_ENCTYPE_RC4_MD4 , "rc4-md4" },
110	- { 0 , NULL },
111	-};
112	-
113	-static const value_string krb5_checksum_types[] = {
114	- { KRB5_CHKSUM_NONE , "none" },
115	- { KRB5_CHKSUM_CRC32 , "crc32" },
116	- { KRB5_CHKSUM_MD4 , "md4" },
117	- { KRB5_CHKSUM_KRB_DES_MAC , "krb-des-mac" },
118	- { KRB5_CHKSUM_KRB_DES_MAC_K , "krb-des-mac-k" },
119	- { KRB5_CHKSUM_MD5 , "md5" },
120	- { KRB5_CHKSUM_MD5_DES , "md5-des" },
121	- { KRB5_CHKSUM_MD5_DES3 , "md5-des3" },
122	- { KRB5_CHKSUM_HMAC_SHA1_DES3_KD, "hmac-sha1-des3-kd" },
123	- { KRB5_CHKSUM_HMAC_SHA1_DES3 , "hmac-sha1-des3" },
124	- { KRB5_CHKSUM_SHA1_UNKEYED , "sha1 (unkeyed)" },
125	- { KRB5_CHKSUM_HMAC_MD5 , "hmac-md5" },
126	- { KRB5_CHKSUM_MD5_HMAC , "md5-hmac" },
127	- { KRB5_CHKSUM_RC4_MD5 , "rc5-md5" },
128	- { KRB5_CHKSUM_MD25 , "md25" },
129	- { KRB5_CHKSUM_DES_MAC_MD5 , "des-mac-md5" },
130	- { KRB5_CHKSUM_DES_MAC , "des-mac" },
131	- { KRB5_CHKSUM_REAL_CRC32 , "real-crc32" },
132	- { KRB5_CHKSUM_SHA1 , "sha1" },
133	- { KRB5_CHKSUM_LM , "lm" },
134	- { KRB5_CHKSUM_GSSAPI , "gssapi-8003" },
135	- { 0 , NULL },
136	-};
137	-#endif
138	-
139	#define KRB5_AD_IF_RELEVANT 1
140	#define KRB5_AD_INTENDED_FOR_SERVER 2
141	#define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS 3

Line 0 Link Here

(-)net/wireshark/files/patch-epan_dissectors_asn1_spnego_packet-spnego-template.c (+21 lines)
	1	--- epan/dissectors/asn1/spnego/packet-spnego-template.c.orig 2016-10-04 18:27:47 UTC
	2	+++ epan/dissectors/asn1/spnego/packet-spnego-template.c
	3	@@ -323,6 +323,9 @@ dissect_spnego_krb5(tvbuff_t *tvb, packe
	4	#ifndef KEYTYPE_ARCFOUR_56
	5	# define KEYTYPE_ARCFOUR_56 24
	6	#endif
	7	+#ifndef KEYTYPE_ARCFOUR_HMAC
	8	+# define KEYTYPE_ARCFOUR_HMAC 23
	9	+#endif
	10	/* XXX - We should probably do a configure-time check for this instead */
	11	#ifndef KRB5_KU_USAGE_SEAL
	12	# define KRB5_KU_USAGE_SEAL 22
	13	@@ -847,7 +850,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *
	14	decrypt_gssapi_krb_arcfour_wrap(tree,
	15	pinfo,
	16	tvb,
	17	- KERB_ENCTYPE_RC4_HMAC,
	18	+ KEYTYPE_ARCFOUR_HMAC,
	19	gssapi_encrypt);
	20	#endif /* HAVE_HEIMDAL_KERBEROS \|\| HAVE_MIT_KERBEROS */
	21	}

Line 0 Link Here

(-)net/wireshark/files/patch-epan_dissectors_packet-kerberos.c (+168 lines)
		1	--- epan/dissectors/packet-kerberos.c.orig 2016-10-04 18:27:49 UTC
		2	+++ epan/dissectors/packet-kerberos.c
		3	@@ -1068,66 +1068,7 @@ decrypt_krb5_data(proto_tree *tree, pack
		4	#define KRB5_MSG_ENC_KRB_CRED_PART 29 /* EncKrbCredPart */
		5	#define KRB5_MSG_ERROR 30 /* KRB-ERROR type */
		6
		7	-/* encryption type constants */
		8	-#define KRB5_ENCTYPE_NULL 0
		9	-#define KRB5_ENCTYPE_DES_CBC_CRC 1
		10	-#define KRB5_ENCTYPE_DES_CBC_MD4 2
		11	-#define KRB5_ENCTYPE_DES_CBC_MD5 3
		12	-#define KRB5_ENCTYPE_DES_CBC_RAW 4
		13	-#define KRB5_ENCTYPE_DES3_CBC_SHA 5
		14	-#define KRB5_ENCTYPE_DES3_CBC_RAW 6
		15	-#define KRB5_ENCTYPE_DES_HMAC_SHA1 8
		16	-#define KRB5_ENCTYPE_DSA_SHA1_CMS 9
		17	-#define KRB5_ENCTYPE_RSA_MD5_CMS 10
		18	-#define KRB5_ENCTYPE_RSA_SHA1_CMS 11
		19	-#define KRB5_ENCTYPE_RC2_CBC_ENV 12
		20	-#define KRB5_ENCTYPE_RSA_ENV 13
		21	-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14
		22	-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
		23	-#define KRB5_ENCTYPE_DES3_CBC_SHA1 16
		24	-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
		25	-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
		26	-#define KRB5_ENCTYPE_DES_CBC_MD5_NT 20
		27	-#define KERB_ENCTYPE_RC4_HMAC 23
		28	-#define KERB_ENCTYPE_RC4_HMAC_EXP 24
		29	-#define KRB5_ENCTYPE_UNKNOWN 0x1ff
		30	-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 0x7007
		31	-#define KRB5_ENCTYPE_RC4_PLAIN_EXP 0xffffff73
		32	-#define KRB5_ENCTYPE_RC4_PLAIN 0xffffff74
		33	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP 0xffffff78
		34	-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP 0xffffff79
		35	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD 0xffffff7a
		36	-#define KRB5_ENCTYPE_RC4_HMAC_OLD 0xffffff7b
		37	-#define KRB5_ENCTYPE_DES_PLAIN 0xffffff7c
		38	-#define KRB5_ENCTYPE_RC4_SHA 0xffffff7d
		39	-#define KRB5_ENCTYPE_RC4_LM 0xffffff7e
		40	-#define KRB5_ENCTYPE_RC4_PLAIN2 0xffffff7f
		41	-#define KRB5_ENCTYPE_RC4_MD4 0xffffff80
		42	-
		43	-/* checksum types */
		44	-#define KRB5_CHKSUM_NONE 0
		45	-#define KRB5_CHKSUM_CRC32 1
		46	-#define KRB5_CHKSUM_MD4 2
		47	-#define KRB5_CHKSUM_KRB_DES_MAC 4
		48	-#define KRB5_CHKSUM_KRB_DES_MAC_K 5
		49	-#define KRB5_CHKSUM_MD5 7
		50	-#define KRB5_CHKSUM_MD5_DES 8
		51	-/* the following four come from packetcable */
		52	-#define KRB5_CHKSUM_MD5_DES3 9
		53	-#define KRB5_CHKSUM_HMAC_SHA1_DES3_KD 12
		54	-#define KRB5_CHKSUM_HMAC_SHA1_DES3 13
		55	-#define KRB5_CHKSUM_SHA1_UNKEYED 14
		56	-#define KRB5_CHKSUM_HMAC_MD5 0xffffff76
		57	-#define KRB5_CHKSUM_MD5_HMAC 0xffffff77
		58	-#define KRB5_CHKSUM_RC4_MD5 0xffffff78
		59	-#define KRB5_CHKSUM_MD25 0xffffff79
		60	-#define KRB5_CHKSUM_DES_MAC_MD5 0xffffff7a
		61	-#define KRB5_CHKSUM_DES_MAC 0xffffff7b
		62	-#define KRB5_CHKSUM_REAL_CRC32 0xffffff7c
		63	-#define KRB5_CHKSUM_SHA1 0xffffff7d
		64	-#define KRB5_CHKSUM_LM 0xffffff7e
65	#define KRB5_CHKSUM_GSSAPI 0x8003
66	-
67	/*
68	* For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
69	*
70	@@ -1423,71 +1364,6 @@ static const value_string krb5_preauthen
71	{ 0 , NULL },
72	};
73
74	-#if 0
75	-static const value_string krb5_encryption_types[] = {
76	- { KRB5_ENCTYPE_NULL , "NULL" },
77	- { KRB5_ENCTYPE_DES_CBC_CRC , "des-cbc-crc" },
78	- { KRB5_ENCTYPE_DES_CBC_MD4 , "des-cbc-md4" },
79	- { KRB5_ENCTYPE_DES_CBC_MD5 , "des-cbc-md5" },
80	- { KRB5_ENCTYPE_DES_CBC_RAW , "des-cbc-raw" },
81	- { KRB5_ENCTYPE_DES3_CBC_SHA , "des3-cbc-sha" },
82	- { KRB5_ENCTYPE_DES3_CBC_RAW , "des3-cbc-raw" },
83	- { KRB5_ENCTYPE_DES_HMAC_SHA1 , "des-hmac-sha1" },
84	- { KRB5_ENCTYPE_DSA_SHA1_CMS , "dsa-sha1-cms" },
85	- { KRB5_ENCTYPE_RSA_MD5_CMS , "rsa-md5-cms" },
86	- { KRB5_ENCTYPE_RSA_SHA1_CMS , "rsa-sha1-cms" },
87	- { KRB5_ENCTYPE_RC2_CBC_ENV , "rc2-cbc-env" },
88	- { KRB5_ENCTYPE_RSA_ENV , "rsa-env" },
89	- { KRB5_ENCTYPE_RSA_ES_OEAP_ENV, "rsa-es-oeap-env" },
90	- { KRB5_ENCTYPE_DES_EDE3_CBC_ENV, "des-ede3-cbc-env" },
91	- { KRB5_ENCTYPE_DES3_CBC_SHA1 , "des3-cbc-sha1" },
92	- { KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 , "aes128-cts-hmac-sha1-96" },
93	- { KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 , "aes256-cts-hmac-sha1-96" },
94	- { KRB5_ENCTYPE_DES_CBC_MD5_NT , "des-cbc-md5-nt" },
95	- { KERB_ENCTYPE_RC4_HMAC , "rc4-hmac" },
96	- { KERB_ENCTYPE_RC4_HMAC_EXP , "rc4-hmac-exp" },
97	- { KRB5_ENCTYPE_UNKNOWN , "unknown" },
98	- { KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 , "local-des3-hmac-sha1" },
99	- { KRB5_ENCTYPE_RC4_PLAIN_EXP , "rc4-plain-exp" },
100	- { KRB5_ENCTYPE_RC4_PLAIN , "rc4-plain" },
101	- { KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP, "rc4-plain-old-exp" },
102	- { KRB5_ENCTYPE_RC4_HMAC_OLD_EXP, "rc4-hmac-old-exp" },
103	- { KRB5_ENCTYPE_RC4_PLAIN_OLD , "rc4-plain-old" },
104	- { KRB5_ENCTYPE_RC4_HMAC_OLD , "rc4-hmac-old" },
105	- { KRB5_ENCTYPE_DES_PLAIN , "des-plain" },
106	- { KRB5_ENCTYPE_RC4_SHA , "rc4-sha" },
107	- { KRB5_ENCTYPE_RC4_LM , "rc4-lm" },
108	- { KRB5_ENCTYPE_RC4_PLAIN2 , "rc4-plain2" },
109	- { KRB5_ENCTYPE_RC4_MD4 , "rc4-md4" },
110	- { 0 , NULL },
111	-};
112	-
113	-static const value_string krb5_checksum_types[] = {
114	- { KRB5_CHKSUM_NONE , "none" },
115	- { KRB5_CHKSUM_CRC32 , "crc32" },
116	- { KRB5_CHKSUM_MD4 , "md4" },
117	- { KRB5_CHKSUM_KRB_DES_MAC , "krb-des-mac" },
118	- { KRB5_CHKSUM_KRB_DES_MAC_K , "krb-des-mac-k" },
119	- { KRB5_CHKSUM_MD5 , "md5" },
120	- { KRB5_CHKSUM_MD5_DES , "md5-des" },
121	- { KRB5_CHKSUM_MD5_DES3 , "md5-des3" },
122	- { KRB5_CHKSUM_HMAC_SHA1_DES3_KD, "hmac-sha1-des3-kd" },
123	- { KRB5_CHKSUM_HMAC_SHA1_DES3 , "hmac-sha1-des3" },
124	- { KRB5_CHKSUM_SHA1_UNKEYED , "sha1 (unkeyed)" },
125	- { KRB5_CHKSUM_HMAC_MD5 , "hmac-md5" },
126	- { KRB5_CHKSUM_MD5_HMAC , "md5-hmac" },
127	- { KRB5_CHKSUM_RC4_MD5 , "rc5-md5" },
128	- { KRB5_CHKSUM_MD25 , "md25" },
129	- { KRB5_CHKSUM_DES_MAC_MD5 , "des-mac-md5" },
130	- { KRB5_CHKSUM_DES_MAC , "des-mac" },
131	- { KRB5_CHKSUM_REAL_CRC32 , "real-crc32" },
132	- { KRB5_CHKSUM_SHA1 , "sha1" },
133	- { KRB5_CHKSUM_LM , "lm" },
134	- { KRB5_CHKSUM_GSSAPI , "gssapi-8003" },
135	- { 0 , NULL },
136	-};
137	-#endif
138	-
139	#define KRB5_AD_IF_RELEVANT 1
140	#define KRB5_AD_INTENDED_FOR_SERVER 2
141	#define KRB5_AD_INTENDED_FOR_APPLICATION_CLASS 3
142	@@ -4341,7 +4217,7 @@ dissect_kerberos_ChangePasswdData(gboole
143
144
145	/--- End of included file: packet-kerberos-fn.c ---/
146	-#line 1985 "./asn1/kerberos/packet-kerberos-template.c"
147	+#line 1861 "./asn1/kerberos/packet-kerberos-template.c"
148
149	/* Make wrappers around exported functions for now */
150	int
151	@@ -5395,7 +5271,7 @@ void proto_register_kerberos(void) {
152	NULL, HFILL }},
153
154	/--- End of included file: packet-kerberos-hfarr.c ---/
155	-#line 2366 "./asn1/kerberos/packet-kerberos-template.c"
156	+#line 2242 "./asn1/kerberos/packet-kerberos-template.c"
157	};
158
159	/* List of subtrees */
160	@@ -5473,7 +5349,7 @@ void proto_register_kerberos(void) {
161	&ett_kerberos_ChangePasswdData,
162
163	/--- End of included file: packet-kerberos-ettarr.c ---/
164	-#line 2382 "./asn1/kerberos/packet-kerberos-template.c"
165	+#line 2258 "./asn1/kerberos/packet-kerberos-template.c"
166	};
167
168	static ei_register_info ei[] = {

Line 0 Link Here

(-)net/wireshark/files/patch-epan_dissectors_packet-kerberos.h (+54 lines)
	1	--- epan/dissectors/packet-kerberos.h.orig 2016-10-04 18:27:49 UTC
	2	+++ epan/dissectors/packet-kerberos.h
	3	@@ -108,42 +108,6 @@ void read_keytab_file_from_preferences(v
	4
	5	#endif /* HAVE_KERBEROS */
	6
	7	-/* encryption type constants */
	8	-#define KRB5_ENCTYPE_NULL 0
	9	-#define KRB5_ENCTYPE_DES_CBC_CRC 1
	10	-#define KRB5_ENCTYPE_DES_CBC_MD4 2
	11	-#define KRB5_ENCTYPE_DES_CBC_MD5 3
	12	-#define KRB5_ENCTYPE_DES_CBC_RAW 4
	13	-#define KRB5_ENCTYPE_DES3_CBC_SHA 5
	14	-#define KRB5_ENCTYPE_DES3_CBC_RAW 6
	15	-#define KRB5_ENCTYPE_DES_HMAC_SHA1 8
	16	-#define KRB5_ENCTYPE_DSA_SHA1_CMS 9
	17	-#define KRB5_ENCTYPE_RSA_MD5_CMS 10
	18	-#define KRB5_ENCTYPE_RSA_SHA1_CMS 11
	19	-#define KRB5_ENCTYPE_RC2_CBC_ENV 12
	20	-#define KRB5_ENCTYPE_RSA_ENV 13
	21	-#define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14
	22	-#define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15
	23	-#define KRB5_ENCTYPE_DES3_CBC_SHA1 16
	24	-#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17
	25	-#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18
	26	-#define KRB5_ENCTYPE_DES_CBC_MD5_NT 20
	27	-#define KERB_ENCTYPE_RC4_HMAC 23
	28	-#define KERB_ENCTYPE_RC4_HMAC_EXP 24
	29	-#define KRB5_ENCTYPE_UNKNOWN 0x1ff
	30	-#define KRB5_ENCTYPE_LOCAL_DES3_HMAC_SHA1 0x7007
	31	-#define KRB5_ENCTYPE_RC4_PLAIN_EXP 0xffffff73
	32	-#define KRB5_ENCTYPE_RC4_PLAIN 0xffffff74
	33	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD_EXP 0xffffff78
	34	-#define KRB5_ENCTYPE_RC4_HMAC_OLD_EXP 0xffffff79
	35	-#define KRB5_ENCTYPE_RC4_PLAIN_OLD 0xffffff7a
	36	-#define KRB5_ENCTYPE_RC4_HMAC_OLD 0xffffff7b
	37	-#define KRB5_ENCTYPE_DES_PLAIN 0xffffff7c
	38	-#define KRB5_ENCTYPE_RC4_SHA 0xffffff7d
	39	-#define KRB5_ENCTYPE_RC4_LM 0xffffff7e
	40	-#define KRB5_ENCTYPE_RC4_PLAIN2 0xffffff7f
	41	-#define KRB5_ENCTYPE_RC4_MD4 0xffffff80
	42	-
	43
	44	/--- Included file: packet-kerberos-exp.h ---/
	45	#line 1 "./asn1/kerberos/packet-kerberos-exp.h"
	46	@@ -170,7 +134,7 @@ void read_keytab_file_from_preferences(v
	47	int dissect_kerberos_ChangePasswdData(gboolean implicit_tag _U_, tvbuff_t tvb _U_, int offset _U_, asn1_ctx_t actx _U_, proto_tree *tree _U_, int hf_index _U_);
	48
	49	/--- End of included file: packet-kerberos-exp.h ---/
	50	-#line 140 "./asn1/kerberos/packet-kerberos-template.h"
	51	+#line 104 "./asn1/kerberos/packet-kerberos-template.h"
	52
	53	#ifdef __cplusplus
	54	}

Line 0 Link Here

(-)net/wireshark/files/patch-epan_dissectors_packet-spnego.c (+39 lines)
	1	--- epan/dissectors/packet-spnego.c.orig 2016-10-04 18:27:52 UTC
	2	+++ epan/dissectors/packet-spnego.c
	3	@@ -775,6 +775,9 @@ dissect_spnego_krb5(tvbuff_t *tvb, packe
	4	#ifndef KEYTYPE_ARCFOUR_56
	5	# define KEYTYPE_ARCFOUR_56 24
	6	#endif
	7	+#ifndef KEYTYPE_ARCFOUR_HMAC
	8	+# define KEYTYPE_ARCFOUR_HMAC 23
	9	+#endif
	10	/* XXX - We should probably do a configure-time check for this instead */
	11	#ifndef KRB5_KU_USAGE_SEAL
	12	# define KRB5_KU_USAGE_SEAL 22
	13	@@ -1299,7 +1302,7 @@ dissect_spnego_krb5_wrap_base(tvbuff_t *
	14	decrypt_gssapi_krb_arcfour_wrap(tree,
	15	pinfo,
	16	tvb,
	17	- KERB_ENCTYPE_RC4_HMAC,
	18	+ KEYTYPE_ARCFOUR_HMAC,
	19	gssapi_encrypt);
	20	#endif /* HAVE_HEIMDAL_KERBEROS \|\| HAVE_MIT_KERBEROS */
	21	}
	22	@@ -1966,7 +1969,7 @@ void proto_register_spnego(void) {
	23	NULL, HFILL }},
	24
	25	/--- End of included file: packet-spnego-hfarr.c ---/
	26	-#line 1421 "./asn1/spnego/packet-spnego-template.c"
	27	+#line 1424 "./asn1/spnego/packet-spnego-template.c"
	28	};
	29
	30	/* List of subtrees */
	31	@@ -1989,7 +1992,7 @@ void proto_register_spnego(void) {
	32	&ett_spnego_InitialContextToken_U,
	33
	34	/--- End of included file: packet-spnego-ettarr.c ---/
	35	-#line 1431 "./asn1/spnego/packet-spnego-template.c"
	36	+#line 1434 "./asn1/spnego/packet-spnego-template.c"
	37	};
	38
	39	static ei_register_info ei[] = {