diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2013-06-01 23:10:37 +0000 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2013-06-01 23:10:37 +0000 |
| commit | c55328033921970f2a91af4fd02f7d0163c366fc (patch) | |
| tree | 24d1b18b7169e87be9384839e5a8b6a81866c20d /asn1/c1222 | |
| parent | d41ce46c92fd4dba1901c44e0c7248254fd9b1b3 (diff) | |
Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8745 :
Upgrade AP-title ASN.1 description
svn path=/trunk/; revision=49684
Diffstat (limited to 'asn1/c1222')
| -rw-r--r-- | asn1/c1222/c1222.asn | 27 | ||||
| -rw-r--r-- | asn1/c1222/c1222.cnf | 1 |
2 files changed, 16 insertions, 12 deletions
diff --git a/asn1/c1222/c1222.asn b/asn1/c1222/c1222.asn index 40012c380e..4b75bc1047 100644 --- a/asn1/c1222/c1222.asn +++ b/asn1/c1222/c1222.asn @@ -5,19 +5,22 @@ C1222-PROTOCOL DEFINITIONS ::= BEGIN C1222-MESSAGE ::= [APPLICATION 0] IMPLICIT SEQUENCE { - aSO-context [1] ASO-qualifier OPTIONAL, - called-AP-title [2] Called-AP-title OPTIONAL, - called-AP-invocation-id [4] Called-AP-invocation-id OPTIONAL, - calling-AP-title [6] Calling-AP-title OPTIONAL, - calling-AE-qualifier [7] Calling-AE-qualifier OPTIONAL, - calling-AP-invocation-id [8] Calling-AP-invocation-id, - mechanism-name [11] IMPLICIT Mechanism-name OPTIONAL, - calling-authentication-value [12] Calling-authentication-value OPTIONAL, - user-information [30] User-information + aSO-context [1] ASO-qualifier OPTIONAL, + called-AP-title [2] Called-AP-title OPTIONAL, + called-AP-invocation-id [4] Called-AP-invocation-id OPTIONAL, + calling-AP-title [6] Calling-AP-title OPTIONAL, + calling-AE-qualifier [7] Calling-AE-qualifier OPTIONAL, + calling-AP-invocation-id [8] Calling-AP-invocation-id, + mechanism-name [11] IMPLICIT Mechanism-name OPTIONAL, + calling-authentication-value [12] Calling-authentication-value OPTIONAL, + user-information [30] User-information } ASO-qualifier ::= OBJECT IDENTIFIER -AP-title ::= OBJECT IDENTIFIER +AP-title ::= CHOICE { + ap-title-form2 OBJECT IDENTIFIER, + ap-title-form4 [0] IMPLICIT OBJECT IDENTIFIER -- RELATIVE-OID +} Called-AP-title ::= AP-title Calling-AP-title ::= AP-title AP-invocation-id ::= INTEGER @@ -35,8 +38,8 @@ Calling-authentication-value ::= [2] IMPLICIT SEQUENCE { } 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 [0] Calling-authentication-value-single-asn1, + calling-authentication-value-octet-aligned [1] IMPLICIT OCTET STRING } Calling-authentication-value-single-asn1 ::= CHOICE { diff --git a/asn1/c1222/c1222.cnf b/asn1/c1222/c1222.cnf index 4bdecf686e..d53bb9aa0c 100644 --- a/asn1/c1222/c1222.cnf +++ b/asn1/c1222/c1222.cnf @@ -22,6 +22,7 @@ C1222-MESSAGE Calling-authentication-value-c1222/_untag/iv-element BLURB="c1222.iv-element" Calling-authentication-value-c1222/_untag/key-id-element BLURB = "c1222.key-id-element" AP-invocation-id TYPE=FT_UINT32 +AE-qualifier TYPE=FT_UINT32 #.FN_BODY User-information gint8 end_device_class; |