aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
authorDhiru Kholia <dhiru.kholia@gmail.com>2017-09-01 11:15:29 +0530
committerPascal Quantin <pascal.quantin@gmail.com>2017-09-01 09:17:16 +0000
commit8f555e43351517f1eb51f04a960936c9fef9a02a (patch)
tree9a1295aa4d980f1df7bf39c8201ccdd6293c4b92 /epan/dissectors/asn1
parent4b6a26d9521ef9eb63706be5ca144037d1d009f2 (diff)
Kerberos: Add support for new etype values from RFC 8009
These new etype values (19 and 20) are described in RFC 8009. https://tools.ietf.org/html/rfc8009 The krb5 package in Red Hat Enterprise Linux 7.4 already supports these new etype values. Change-Id: Ic8d0b60b08ac1b48361c80adc28d8c408bf7666a Reviewed-on: https://code.wireshark.org/review/23348 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/kerberos/k5.asn4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/asn1/kerberos/k5.asn b/epan/dissectors/asn1/kerberos/k5.asn
index 73198b42db..ea4e47a371 100644
--- a/epan/dissectors/asn1/kerberos/k5.asn
+++ b/epan/dissectors/asn1/kerberos/k5.asn
@@ -124,7 +124,7 @@ CKSUMTYPE ::= INTEGER {
cKSUMTYPE-HMAC-MD5-ENC(-1138) -- even more unofficial
}
---enctypes
+--enctypes http://www.iana.org/assignments/kerberos-parameters/kerberos-parameters.xhtml#kerberos-parameters-1
ENCTYPE ::= INTEGER {
eTYPE-NULL(0),
eTYPE-DES-CBC-CRC(1),
@@ -143,6 +143,8 @@ ENCTYPE ::= INTEGER {
eTYPE-DES3-CBC-SHA1(16), -- with key derivation
eTYPE-AES128-CTS-HMAC-SHA1-96(17),
eTYPE-AES256-CTS-HMAC-SHA1-96(18),
+ eTYPE-AES128-CTS-HMAC-SHA256-128(19), -- RFC 8009
+ eTYPE-AES256-CTS-HMAC-SHA384-192(20), -- RFC 8009
eTYPE-ARCFOUR-HMAC-MD5(23),
eTYPE-ARCFOUR-HMAC-MD5-56(24),
eTYPE-CAMELLIA128-CTS-CMAC(25),