projects / packages / wireshark.git / blame
| Commit | Line | Data |
|---|---|---|
| 5ab012f2 AO |
1 | diff -ruNp wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.c wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.c |
| 2 | --- wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.c 2016-09-07 18:59:02.000000000 +0200 | |
| 3 | +++ wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.c 2016-09-12 15:31:55.598702256 +0200 | |
| 4 | @@ -810,10 +810,6 @@ decrypt_krb5_data(proto_tree *tree, pack | |
| 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 | @@ -825,9 +821,6 @@ decrypt_krb5_data(proto_tree *tree, pack | |
| 16 | #define KRB5_ENCTYPE_RSA_ENV 13 | |
| 17 | #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14 | |
| 18 | #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15 | |
| 19 | -#define KRB5_ENCTYPE_DES3_CBC_SHA1 16 | |
| 20 | -#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17 | |
| 21 | -#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18 | |
| 22 | #define KRB5_ENCTYPE_DES_CBC_MD5_NT 20 | |
| 23 | #define KERB_ENCTYPE_RC4_HMAC 23 | |
| 24 | #define KERB_ENCTYPE_RC4_HMAC_EXP 24 | |
| 25 | diff -ruNp wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.h wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.h | |
| 26 | --- wireshark-2.2.0.orig/epan/dissectors/asn1/kerberos/packet-kerberos-template.h 2016-09-07 18:59:02.000000000 +0200 | |
| 27 | +++ wireshark-2.2.0/epan/dissectors/asn1/kerberos/packet-kerberos-template.h 2016-09-12 15:31:55.171703765 +0200 | |
| 28 | @@ -101,10 +101,6 @@ void read_keytab_file_from_preferences(v | |
| 29 | #endif /* HAVE_KERBEROS */ | |
| 30 | ||
| 31 | /* encryption type constants */ | |
| 32 | -#define KRB5_ENCTYPE_NULL 0 | |
| 33 | -#define KRB5_ENCTYPE_DES_CBC_CRC 1 | |
| 34 | -#define KRB5_ENCTYPE_DES_CBC_MD4 2 | |
| 35 | -#define KRB5_ENCTYPE_DES_CBC_MD5 3 | |
| 36 | #define KRB5_ENCTYPE_DES_CBC_RAW 4 | |
| 37 | #define KRB5_ENCTYPE_DES3_CBC_SHA 5 | |
| 38 | #define KRB5_ENCTYPE_DES3_CBC_RAW 6 | |
| 39 | @@ -116,9 +112,6 @@ void read_keytab_file_from_preferences(v | |
| 40 | #define KRB5_ENCTYPE_RSA_ENV 13 | |
| 41 | #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14 | |
| 42 | #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15 | |
| 43 | -#define KRB5_ENCTYPE_DES3_CBC_SHA1 16 | |
| 44 | -#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17 | |
| 45 | -#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18 | |
| 46 | #define KRB5_ENCTYPE_DES_CBC_MD5_NT 20 | |
| 47 | #define KERB_ENCTYPE_RC4_HMAC 23 | |
| 48 | #define KERB_ENCTYPE_RC4_HMAC_EXP 24 | |
| 49 | diff -ruNp wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.c wireshark-2.2.0/epan/dissectors/packet-kerberos.c | |
| 50 | --- wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.c 2016-09-07 18:59:03.000000000 +0200 | |
| 51 | +++ wireshark-2.2.0/epan/dissectors/packet-kerberos.c 2016-09-12 15:31:56.421699346 +0200 | |
| 52 | @@ -1069,10 +1069,6 @@ decrypt_krb5_data(proto_tree *tree, pack | |
| 53 | #define KRB5_MSG_ERROR 30 /* KRB-ERROR type */ | |
| 54 | ||
| 55 | /* encryption type constants */ | |
| 56 | -#define KRB5_ENCTYPE_NULL 0 | |
| 57 | -#define KRB5_ENCTYPE_DES_CBC_CRC 1 | |
| 58 | -#define KRB5_ENCTYPE_DES_CBC_MD4 2 | |
| 59 | -#define KRB5_ENCTYPE_DES_CBC_MD5 3 | |
| 60 | #define KRB5_ENCTYPE_DES_CBC_RAW 4 | |
| 61 | #define KRB5_ENCTYPE_DES3_CBC_SHA 5 | |
| 62 | #define KRB5_ENCTYPE_DES3_CBC_RAW 6 | |
| 63 | @@ -1084,9 +1080,6 @@ decrypt_krb5_data(proto_tree *tree, pack | |
| 64 | #define KRB5_ENCTYPE_RSA_ENV 13 | |
| 65 | #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14 | |
| 66 | #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15 | |
| 67 | -#define KRB5_ENCTYPE_DES3_CBC_SHA1 16 | |
| 68 | -#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17 | |
| 69 | -#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18 | |
| 70 | #define KRB5_ENCTYPE_DES_CBC_MD5_NT 20 | |
| 71 | #define KERB_ENCTYPE_RC4_HMAC 23 | |
| 72 | #define KERB_ENCTYPE_RC4_HMAC_EXP 24 | |
| 73 | diff -ruNp wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.h wireshark-2.2.0/epan/dissectors/packet-kerberos.h | |
| 74 | --- wireshark-2.2.0.orig/epan/dissectors/packet-kerberos.h 2016-09-07 18:59:03.000000000 +0200 | |
| 75 | +++ wireshark-2.2.0/epan/dissectors/packet-kerberos.h 2016-09-12 15:31:56.003700824 +0200 | |
| 76 | @@ -109,10 +109,6 @@ void read_keytab_file_from_preferences(v | |
| 77 | #endif /* HAVE_KERBEROS */ | |
| 78 | ||
| 79 | /* encryption type constants */ | |
| 80 | -#define KRB5_ENCTYPE_NULL 0 | |
| 81 | -#define KRB5_ENCTYPE_DES_CBC_CRC 1 | |
| 82 | -#define KRB5_ENCTYPE_DES_CBC_MD4 2 | |
| 83 | -#define KRB5_ENCTYPE_DES_CBC_MD5 3 | |
| 84 | #define KRB5_ENCTYPE_DES_CBC_RAW 4 | |
| 85 | #define KRB5_ENCTYPE_DES3_CBC_SHA 5 | |
| 86 | #define KRB5_ENCTYPE_DES3_CBC_RAW 6 | |
| 87 | @@ -124,9 +120,6 @@ void read_keytab_file_from_preferences(v | |
| 88 | #define KRB5_ENCTYPE_RSA_ENV 13 | |
| 89 | #define KRB5_ENCTYPE_RSA_ES_OEAP_ENV 14 | |
| 90 | #define KRB5_ENCTYPE_DES_EDE3_CBC_ENV 15 | |
| 91 | -#define KRB5_ENCTYPE_DES3_CBC_SHA1 16 | |
| 92 | -#define KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96 17 | |
| 93 | -#define KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96 18 | |
| 94 | #define KRB5_ENCTYPE_DES_CBC_MD5_NT 20 | |
| 95 | #define KERB_ENCTYPE_RC4_HMAC 23 | |
| 96 | #define KERB_ENCTYPE_RC4_HMAC_EXP 24 |