diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2018-02-25 18:11:20 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-02-25 21:14:33 +0000 |
| commit | a29d697a25bca1e0ce6109f705f43db05e4d6f97 (patch) | |
| tree | 15def4f7e99ac7fbdc182e2175acb82a6dbd76d5 | |
| parent | a35592eb20ae4371da99788e3c5a8796616390f3 (diff) | |
kerberos: fix duplicate entry
Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 1 is at indices 1 (kRB5-PADATA-TGS-REQ) and 2 (kRB5-PADATA-AP-REQ))
Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 132 is at indices 40 (kRB5-PADATA-AS-CHECKSUM) and 41 (kRB5-PADATA-PK-AS-09-BINDING))
Change-Id: I1069dec9cb59f753f2a9a2c4fd901f836f689a87
Reviewed-on: https://code.wireshark.org/review/26101
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/asn1/kerberos/k5.asn | 4 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/epan/dissectors/asn1/kerberos/k5.asn b/epan/dissectors/asn1/kerberos/k5.asn index f88b8bb75d..71771150b1 100644 --- a/epan/dissectors/asn1/kerberos/k5.asn +++ b/epan/dissectors/asn1/kerberos/k5.asn @@ -48,7 +48,7 @@ MESSAGE-TYPE ::= INTEGER { PADATA-TYPE ::= INTEGER { kRB5-PADATA-NONE(0), kRB5-PADATA-TGS-REQ(1), - kRB5-PADATA-AP-REQ(1), +-- kRB5-PADATA-AP-REQ(1), kRB5-PADATA-ENC-TIMESTAMP(2), kRB5-PADATA-PW-SALT(3), kRB5-PADATA-ENC-UNIX-TIME(5), @@ -88,7 +88,7 @@ PADATA-TYPE ::= INTEGER { kRB5-PADATA-FOR-USER(129), -- MS-KILE kRB5-PADATA-FOR-X509-USER(130), -- MS-KILE kRB5-PADATA-FOR-CHECK-DUPS(131), -- MS-KILE - kRB5-PADATA-AS-CHECKSUM(132), -- MS-KILE +-- kRB5-PADATA-AS-CHECKSUM(132), - MS-KILE kRB5-PADATA-PK-AS-09-BINDING(132), -- client send this to -- tell KDC that is supports -- the asCheckSum in the diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index f5d70c32a2..61c96897a5 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2941,7 +2941,6 @@ guint32 msgtype; static const value_string kerberos_PADATA_TYPE_vals[] = { { 0, "kRB5-PADATA-NONE" }, { 1, "kRB5-PADATA-TGS-REQ" }, - { 1, "kRB5-PADATA-AP-REQ" }, { 2, "kRB5-PADATA-ENC-TIMESTAMP" }, { 3, "kRB5-PADATA-PW-SALT" }, { 5, "kRB5-PADATA-ENC-UNIX-TIME" }, @@ -2979,7 +2978,6 @@ static const value_string kerberos_PADATA_TYPE_vals[] = { { 129, "kRB5-PADATA-FOR-USER" }, { 130, "kRB5-PADATA-FOR-X509-USER" }, { 131, "kRB5-PADATA-FOR-CHECK-DUPS" }, - { 132, "kRB5-PADATA-AS-CHECKSUM" }, { 132, "kRB5-PADATA-PK-AS-09-BINDING" }, { 133, "kRB5-PADATA-FX-COOKIE" }, { 134, "kRB5-PADATA-AUTHENTICATION-SET" }, |