aboutsummaryrefslogtreecommitdiffstats
path: root/packet-kerberos.c
diff options
context:
space:
mode:
authorguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-09-10 02:15:55 +0000
committerguy <guy@f5534014-38df-0310-8fa8-9805f1628bb7>2002-09-10 02:15:55 +0000
commitc8e0195400a5cda24ac882a615ce122ffd3bbb43 (patch)
treeaf4d6e6f527c6f9aaa2dacd6d34c5620f726c9c0 /packet-kerberos.c
parent02adc1549bd656d709111497505cee5ec38c15cc (diff)
Add Microsoft's RC4-HMAC and exportable(?) RC4-HMAC encryption types.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6242 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-kerberos.c')
-rw-r--r--packet-kerberos.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/packet-kerberos.c b/packet-kerberos.c
index 93594e3e2e..976ce903aa 100644
--- a/packet-kerberos.c
+++ b/packet-kerberos.c
@@ -5,7 +5,7 @@
* Richard Share (C) 2002, rsharpe@samba.org, modularized a bit more and
* added AP-REQ and AP-REP dissection
*
- * $Id: packet-kerberos.c,v 1.34 2002/09/08 22:41:23 guy Exp $
+ * $Id: packet-kerberos.c,v 1.35 2002/09/10 02:15:55 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -141,10 +141,20 @@ static gint ett_additional_tickets = -1;
#define KRB5_ENCTYPE_DES3_CBC_SHA 5
#define KRB5_ENCTYPE_DES3_CBC_RAW 6
#define KRB5_ENCTYPE_DES_HMAC_SHA1 8
-#define KRB5_ENCTYPE_DES3_CBC_SHA1 0x10
+#define KRB5_ENCTYPE_DES3_CBC_SHA1 0x10 /* 16 */
+#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
+/*
+ * For KERB_ENCTYPE_RC4_HMAC and KERB_ENCTYPE_RC4_HMAC_EXP, see
+ *
+ * http://www.ietf.org/internet-drafts/draft-brezak-win2k-krb-rc4-hmac-04.txt
+ *
+ * unless it's expired.
+ */
+
/* pre-authentication type constants */
#define KRB5_PA_TGS_REQ 1
#define KRB5_PA_ENC_TIMESTAMP 2
@@ -319,6 +329,8 @@ static const value_string krb5_encryption_types[] = {
{ KRB5_ENCTYPE_DES3_CBC_RAW , "des3-cbc-raw" },
{ KRB5_ENCTYPE_DES_HMAC_SHA1 , "des-hmac-sha1" },
{ KRB5_ENCTYPE_DES3_CBC_SHA1 , "des3-cbc-sha1" },
+ { 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" },
{ 0 , NULL },