diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2017-05-02 12:16:16 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-05-02 12:27:59 +0000 |
| commit | b64889d62e9b4a5494c38b7e585c6eedae1a466c (patch) | |
| tree | f83e350cf9c3ea3d820f004b9cf0a08dcb6c39af /epan | |
| parent | 093f13065247c9337a7a3319dfe3ca56e7d01eff (diff) | |
kerberos: fix conflicting entry in its value_string
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: 15 is at indices 15 (kRB5-PADATA-PK-AS-REP-19) and 16 (kRB5-PADATA-PK-AS-REQ-WIN))
Field 'padata-type' (kerberos.padata_type) has a conflicting entry in its value_string: 20 is at indices 21 (kRB5-PADATA-USE-SPECIFIED-KVNO) and 22 (kRB5-PADATA-SVR-REFERRAL-INFO))
Change-Id: I504291b8eb181c9e40d54421f583755cfc4f17db
Reviewed-on: https://code.wireshark.org/review/21454
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/asn1/kerberos/k5.asn | 6 | ||||
| -rw-r--r-- | epan/dissectors/packet-kerberos.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/epan/dissectors/asn1/kerberos/k5.asn b/epan/dissectors/asn1/kerberos/k5.asn index dde61ec87f..73198b42db 100644 --- a/epan/dissectors/asn1/kerberos/k5.asn +++ b/epan/dissectors/asn1/kerberos/k5.asn @@ -40,7 +40,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), @@ -54,13 +54,13 @@ PADATA-TYPE ::= INTEGER { kRB5-PADATA-SAM-RESPONSE(13), -- (sam/otp) kRB5-PADATA-PK-AS-REQ-19(14), -- (PKINIT-19) kRB5-PADATA-PK-AS-REP-19(15), -- (PKINIT-19) - kRB5-PADATA-PK-AS-REQ-WIN(15), -- (PKINIT - old number) +-- kRB5-PADATA-PK-AS-REQ-WIN(15), (PKINIT - old number) kRB5-PADATA-PK-AS-REQ(16), -- (PKINIT-25) kRB5-PADATA-PK-AS-REP(17), -- (PKINIT-25) kRB5-PADATA-PA-PK-OCSP-RESPONSE(18), kRB5-PADATA-ETYPE-INFO2(19), kRB5-PADATA-USE-SPECIFIED-KVNO(20), - kRB5-PADATA-SVR-REFERRAL-INFO(20), --- old ms referral number +-- kRB5-PADATA-SVR-REFERRAL-INFO(20), old ms referral number kRB5-PADATA-SAM-REDIRECT(21), -- (sam/otp) kRB5-PADATA-GET-FROM-TYPED-DATA(22), kRB5-PADATA-SAM-ETYPE-INFO(23), diff --git a/epan/dissectors/packet-kerberos.c b/epan/dissectors/packet-kerberos.c index dcaa5aa123..a709551409 100644 --- a/epan/dissectors/packet-kerberos.c +++ b/epan/dissectors/packet-kerberos.c @@ -2884,7 +2884,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" }, @@ -2898,13 +2897,11 @@ static const value_string kerberos_PADATA_TYPE_vals[] = { { 13, "kRB5-PADATA-SAM-RESPONSE" }, { 14, "kRB5-PADATA-PK-AS-REQ-19" }, { 15, "kRB5-PADATA-PK-AS-REP-19" }, - { 15, "kRB5-PADATA-PK-AS-REQ-WIN" }, { 16, "kRB5-PADATA-PK-AS-REQ" }, { 17, "kRB5-PADATA-PK-AS-REP" }, { 18, "kRB5-PADATA-PA-PK-OCSP-RESPONSE" }, { 19, "kRB5-PADATA-ETYPE-INFO2" }, { 20, "kRB5-PADATA-USE-SPECIFIED-KVNO" }, - { 20, "kRB5-PADATA-SVR-REFERRAL-INFO" }, { 21, "kRB5-PADATA-SAM-REDIRECT" }, { 22, "kRB5-PADATA-GET-FROM-TYPED-DATA" }, { 23, "kRB5-PADATA-SAM-ETYPE-INFO" }, |