Commit 6ded754e authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0525' into 'meeting/SA100'

TS 33.128 CR0525 - Correction of ASN.1 for TLS AKMA IRI Rel-18

See merge request !168
parents 57a65cb4 6430fa36
Loading
Loading
Loading
Loading
Loading
+7 −6
Original line number Diff line number Diff line
@@ -1161,7 +1161,7 @@ GenericUAStarParams ::= SEQUENCE
}

-- ===========================================
-- Specific UaStarParmas for TLS 1.2 (RFC5246)
-- Specific UaStarParams for TLS 1.2 (RFC5246)
-- ===========================================

TLSCipherType ::= ENUMERATED
@@ -1186,8 +1186,8 @@ TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255)

TLS12UAStarParams ::= SEQUENCE
{
   preMasterSecret       [1] OCTET STRING (SIZE(6)) OPTIONAL,
   masterSecret          [2] OCTET STRING (SIZE(6)),
   preMasterSecret       [1] OCTET STRING (SIZE(48)) OPTIONAL,
   masterSecret          [2] OCTET STRING (SIZE(48)),
   pRFAlgorithm          [3] TLSPRFAlgorithm,
   cipherSuite           [4] TLSCipherSuite,
   cipherType            [5] TLSCipherType,
@@ -1198,12 +1198,13 @@ TLS12UAStarParams ::= SEQUENCE
   macLength             [10] INTEGER (0..255),
   macKeyLength          [11] INTEGER (0..255),
   compressionAlgorithm  [12] TLSCompressionAlgorithm,
   clientRandom          [13] OCTET STRING (SIZE(4)),
   serverRandom          [14] OCTET STRING (SIZE(4)),
   clientRandom          [13] OCTET STRING (SIZE(32)),
   serverRandom          [14] OCTET STRING (SIZE(32)),
   clientSequenceNumber  [15] INTEGER,
   serverSequenceNumber  [16] INTEGER,
   sessionID             [17] OCTET STRING (SIZE(0..32)),
   tLSExtensions         [18] OCTET STRING (SIZE(0..65535))
   tLSServerExtensions   [18] OCTET STRING (SIZE(0..65535)),
   tLSClientExtensions   [19] OCTET STRING (SIZE(0..65535)) OPTIONAL
}

KAF ::= OCTET STRING