diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2020-07-04 18:27:11 +0200 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2020-07-20 20:12:14 +0000 |
| commit | 7db43f0b8900af8db821d78c6d3c93fd144edb56 (patch) | |
| tree | f6fa42c04127524f7020820067cb0d52e31f821f | |
| parent | 13e82fa4c1aad7a8c13b18040cfbd55aee04be8f (diff) | |
C12.22: Fix Calling-authentication-value-c1221 CHOICE
This ASN.1 CHOICE has three items with the same tag. Without access
to the spec, assuming these are sequentially numbered change the tags
on the subsequent elements.
This is detected by conflict check.
Change-Id: I0d7e6ace53426ba2661b133f7e825c1a305338ef
Reviewed-on: https://code.wireshark.org/review/37697
Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl>
Reviewed-by: Ed Beroset <beroset@ieee.org>
Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
| -rw-r--r-- | epan/dissectors/asn1/c1222/c1222.asn | 16 | ||||
| -rw-r--r-- | epan/dissectors/packet-c1222.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/asn1/c1222/c1222.asn b/epan/dissectors/asn1/c1222/c1222.asn index 39ac7756a3..a92781ce04 100644 --- a/epan/dissectors/asn1/c1222/c1222.asn +++ b/epan/dissectors/asn1/c1222/c1222.asn @@ -33,19 +33,19 @@ AE-qualifier ::= INTEGER Calling-AE-qualifier ::= AE-qualifier Mechanism-name ::= OBJECT IDENTIFIER --- this is all of the authentication mechanism related stuff +-- this is all of the authentication mechanism related stuff Calling-authentication-value ::= [2] IMPLICIT SEQUENCE { calling-authentication-value-indirect INTEGER DEFAULT 0, calling-authentication-value-encoding Authentication-value-encoding } -Authentication-value-encoding ::= CHOICE { - calling-authentication-value-single-asn1 [0] Calling-authentication-value-single-asn1, +Authentication-value-encoding ::= CHOICE { + calling-authentication-value-single-asn1 [0] Calling-authentication-value-single-asn1, calling-authentication-value-octet-aligned [1] IMPLICIT OCTET STRING } -Calling-authentication-value-single-asn1 ::= CHOICE { +Calling-authentication-value-single-asn1 ::= CHOICE { calling-authentication-value-c1222 Calling-authentication-value-c1222, calling-authentication-value-c1221 Calling-authentication-value-c1221 } @@ -60,13 +60,13 @@ Iv-element ::= OCTET STRING (SIZE(4)) Calling-authentication-value-c1221 ::= [0] IMPLICIT CHOICE { c1221-auth-identification [0] IMPLICIT OCTET STRING (SIZE(3|5..259)), - c1221-auth-request [0] IMPLICIT OCTET STRING (SIZE(1..255)), - c1221-auth-response [0] IMPLICIT OCTET STRING (SIZE(0|1..255)), + c1221-auth-request [1] IMPLICIT OCTET STRING (SIZE(1..255)), + c1221-auth-response [2] IMPLICIT OCTET STRING (SIZE(0|1..255)), ... } --- now the user information (EPSEM) -User-information ::= EXTERNAL +-- now the user information (EPSEM) +User-information ::= EXTERNAL --User-information EPSEM-TYPE ::= { ... } diff --git a/epan/dissectors/packet-c1222.c b/epan/dissectors/packet-c1222.c index 0d9f2aca5e..e15fd650eb 100644 --- a/epan/dissectors/packet-c1222.c +++ b/epan/dissectors/packet-c1222.c @@ -1368,15 +1368,15 @@ dissect_c1222_OCTET_STRING_SIZE_CONSTR002(gboolean implicit_tag _U_, tvbuff_t *t static const value_string c1222_Calling_authentication_value_c1221_U_vals[] = { { 0, "c1221-auth-identification" }, - { 0, "c1221-auth-request" }, - { 0, "c1221-auth-response" }, + { 1, "c1221-auth-request" }, + { 2, "c1221-auth-response" }, { 0, NULL } }; static const ber_choice_t Calling_authentication_value_c1221_U_choice[] = { { 0, &hf_c1222_c1221_auth_identification, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_c1222_OCTET_STRING_SIZE_CONSTR001 }, - { 0, &hf_c1222_c1221_auth_request, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_c1222_OCTET_STRING_SIZE_1_255 }, - { 0, &hf_c1222_c1221_auth_response, BER_CLASS_CON, 0, BER_FLAGS_IMPLTAG, dissect_c1222_OCTET_STRING_SIZE_CONSTR002 }, + { 1, &hf_c1222_c1221_auth_request, BER_CLASS_CON, 1, BER_FLAGS_IMPLTAG, dissect_c1222_OCTET_STRING_SIZE_1_255 }, + { 2, &hf_c1222_c1221_auth_response, BER_CLASS_CON, 2, BER_FLAGS_IMPLTAG, dissect_c1222_OCTET_STRING_SIZE_CONSTR002 }, { 0, NULL, 0, 0, 0, NULL } }; |