Index: Makefile =================================================================== --- Makefile (revision 426883) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= wireshark -PORTVERSION= 2.2.1 +PORTVERSION= 2.2.2 PORTREVISION?= 0 CATEGORIES= net ipv6 MASTER_SITES= http://www.wireshark.org/download/src/ \ Index: distinfo =================================================================== --- distinfo (revision 426883) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1476653554 -SHA256 (wireshark-2.2.1.tar.bz2) = 900e22af04c8b35e0d02a25a360ab1fb7cfe5ac18fc48a9afd75a7103e569149 -SIZE (wireshark-2.2.1.tar.bz2) = 32154087 +TIMESTAMP = 1479830716 +SHA256 (wireshark-2.2.2.tar.bz2) = f9acef5e9a9021a400b4244fafc06969f41ec594ec57fd7f0ff63bafca0055b3 +SIZE (wireshark-2.2.2.tar.bz2) = 32230208 Index: files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.c =================================================================== --- files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.c (revision 426883) +++ files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.c (nonexistent) @@ -1,141 +0,0 @@ ---- 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 Property changes on: files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.h =================================================================== --- files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.h (revision 426883) +++ files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.h (nonexistent) @@ -1,45 +0,0 @@ ---- 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 Property changes on: files/patch-epan_dissectors_asn1_kerberos_packet-kerberos-template.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-epan_dissectors_asn1_spnego_packet-spnego-template.c =================================================================== --- files/patch-epan_dissectors_asn1_spnego_packet-spnego-template.c (revision 426883) +++ files/patch-epan_dissectors_asn1_spnego_packet-spnego-template.c (nonexistent) @@ -1,21 +0,0 @@ ---- 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 */ - } Property changes on: files/patch-epan_dissectors_asn1_spnego_packet-spnego-template.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-epan_dissectors_packet-kerberos.c =================================================================== --- files/patch-epan_dissectors_packet-kerberos.c (revision 426883) +++ files/patch-epan_dissectors_packet-kerberos.c (nonexistent) @@ -1,168 +0,0 @@ ---- 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[] = { Property changes on: files/patch-epan_dissectors_packet-kerberos.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-epan_dissectors_packet-kerberos.h =================================================================== --- files/patch-epan_dissectors_packet-kerberos.h (revision 426883) +++ files/patch-epan_dissectors_packet-kerberos.h (nonexistent) @@ -1,54 +0,0 @@ ---- 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 - } Property changes on: files/patch-epan_dissectors_packet-kerberos.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: files/patch-epan_dissectors_packet-spnego.c =================================================================== --- files/patch-epan_dissectors_packet-spnego.c (revision 426883) +++ files/patch-epan_dissectors_packet-spnego.c (nonexistent) @@ -1,39 +0,0 @@ ---- 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[] = { Property changes on: files/patch-epan_dissectors_packet-spnego.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property