osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Mark Cunningham 2015-05-03 20:01:04 +01:00 committed by Peter Wu
parent cc02069407
commit 5d20b5880d
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
asn1/kerberos/k5.asn
View File

@ -112,10 +112,13 @@ CKSUMTYPE ::= INTEGER {
cKSUMTYPE-RSA-MD5-DES(8),
cKSUMTYPE-RSA-MD5-DES3(9),
cKSUMTYPE-SHA1-OTHER(10),
cKSUMTYPE-HMAC-SHA1-DES3(12),
cKSUMTYPE-HMAC-SHA1-DES3-KD(12),
cKSUMTYPE-HMAC-SHA1-DES3(13),
cKSUMTYPE-SHA1(14),
cKSUMTYPE-HMAC-SHA1-96-AES-128(15),
cKSUMTYPE-HMAC-SHA1-96-AES-256(16),
cKSUMTYPE-CMAC-CAMELLIA128(17),
cKSUMTYPE-CMAC-CAMELLIA256(18),
cKSUMTYPE-GSSAPI(--0x8003--32771),
cKSUMTYPE-HMAC-MD5(-138), -- unofficial microsoft number
cKSUMTYPE-HMAC-MD5-ENC(-1138) -- even more unofficial
@ -130,13 +133,20 @@ ENCTYPE ::= INTEGER {
eTYPE-DES3-CBC-MD5(5),
eTYPE-OLD-DES3-CBC-SHA1(7),
eTYPE-SIGN-DSA-GENERATE(8),
eTYPE-ENCRYPT-RSA-PRIV(9),
eTYPE-ENCRYPT-RSA-PUB(10),
eTYPE-DSA-SHA1(9),
eTYPE-RSA-MD5(10),
eTYPE-RSA-SHA1(11),
eTYPE-RC2-CBC(12),
eTYPE-RSA(13),
eTYPE-RSAES-OAEP(14),
eTYPE-DES-EDE3-CBC(15),
eTYPE-DES3-CBC-SHA1(16), -- with key derivation
eTYPE-AES128-CTS-HMAC-SHA1-96(17),
eTYPE-AES256-CTS-HMAC-SHA1-96(18),
eTYPE-ARCFOUR-HMAC-MD5(23),
eTYPE-ARCFOUR-HMAC-MD5-56(24),
eTYPE-CAMELLIA128-CTS-CMAC(25),
eTYPE-CAMELLIA256-CTS-CMAC(26),
eTYPE-ENCTYPE-PK-CROSS(48),
-- some "old" windows types
eTYPE-ARCFOUR-MD4(-128),

16
epan/dissectors/packet-kerberos.c
View File

@ -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" },