diff options
| author | Mark Cunningham <launchpad@markcunningham.ie> | 2015-05-03 20:01:04 +0100 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2015-05-05 18:59:36 +0000 |
| commit | 5d20b5880db6351d807ca0020ee4d369a311e27c (patch) | |
| tree | 136c85c04ebc04a042fc3c8e044552e3259008d7 /epan/dissectors/packet-kerberos.c | |
| parent | cc020694076af8d3e5cd9cba6db2c8e0bd435714 (diff) | |
kerberos encryption types (etype) additions + cleanup
source http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml and referenced RFCs
Change-Id: I898218c3ef75da21130f3f6c83848c0fca095acf
Reviewed-on: https://code.wireshark.org/review/8300
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Diffstat (limited to 'epan/dissectors/packet-kerberos.c')
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index 5cbe79f350..ca817988f2 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2325,13 +2325,20 @@ static const value_string kerberos_ENCTYPE_vals[] = { { 5, "eTYPE-DES3-CBC-MD5" }, { 7, "eTYPE-OLD-DES3-CBC-SHA1" }, { 8, "eTYPE-SIGN-DSA-GENERATE" }, - { 9, "eTYPE-ENCRYPT-RSA-PRIV" }, - { 10, "eTYPE-ENCRYPT-RSA-PUB" }, + { 9, "eTYPE-DSA-SHA1" }, + { 10, "eTYPE-RSA-MD5" }, + { 11, "eTYPE-RSA-SHA1" }, + { 12, "eTYPE-RC2-CBC" }, + { 13, "eTYPE-RSA" }, + { 14, "eTYPE-RSAES-OAEP" }, + { 15, "eTYPE-DES-EDE3-CBC" }, { 16, "eTYPE-DES3-CBC-SHA1" }, { 17, "eTYPE-AES128-CTS-HMAC-SHA1-96" }, { 18, "eTYPE-AES256-CTS-HMAC-SHA1-96" }, { 23, "eTYPE-ARCFOUR-HMAC-MD5" }, { 24, "eTYPE-ARCFOUR-HMAC-MD5-56" }, + { 25, "eTYPE-CAMELLIA128-CTS-CMAC" }, + { 26, "eTYPE-CAMELLIA256-CTS-CMAC" }, { 48, "eTYPE-ENCTYPE-PK-CROSS" }, { -128, "eTYPE-ARCFOUR-MD4" }, { -133, "eTYPE-ARCFOUR-HMAC-OLD" }, @@ -2444,10 +2451,13 @@ static const value_string kerberos_CKSUMTYPE_vals[] = { { 8, "cKSUMTYPE-RSA-MD5-DES" }, { 9, "cKSUMTYPE-RSA-MD5-DES3" }, { 10, "cKSUMTYPE-SHA1-OTHER" }, - { 12, "cKSUMTYPE-HMAC-SHA1-DES3" }, + { 12, "cKSUMTYPE-HMAC-SHA1-DES3-KD" }, + { 13, "cKSUMTYPE-HMAC-SHA1-DES3" }, { 14, "cKSUMTYPE-SHA1" }, { 15, "cKSUMTYPE-HMAC-SHA1-96-AES-128" }, { 16, "cKSUMTYPE-HMAC-SHA1-96-AES-256" }, + { 17, "cKSUMTYPE-CMAC-CAMELLIA128" }, + { 18, "cKSUMTYPE-CMAC-CAMELLIA256" }, { 32771, "cKSUMTYPE-GSSAPI" }, { -138, "cKSUMTYPE-HMAC-MD5" }, { -1138, "cKSUMTYPE-HMAC-MD5-ENC" }, |