Commit d0000890 authored by naslundma's avatar naslundma Committed by canterburym
Browse files

Update file TS33128Payloads.asn

parent 395f4533
Loading
Loading
Loading
Loading
+17 −16
Original line number Diff line number Diff line
@@ -1302,9 +1302,10 @@ TLS12UAStarParams ::= SEQUENCE
    tLSClientExtensions   [19] OCTET STRING (SIZE(0..65535)) OPTIONAL
}

-- ===========================================
-- ==================================================
-- Specific UaStarParams for TLS 1.3 (RFC8446)
-- ===========================================
-- Inline references below are to clauses of RFC8446.
-- ==================================================

-- RFC8846, clause 4.2: Available handshake extension types.

@@ -1335,8 +1336,8 @@ TLS13ExtensionType ::= ENUMERATED
}

-- RFC8846, clause 4.2: Extensions.
-- Carried as extension to the client's and server's Hello,
-- or, in the server's EncryptedExtensions message.
-- Carried as extension to the client's and server's 
-- Hello, or, in the server's EncryptedExtensions message.
TLS13Extension ::= SEQUENCE
{
    extensionType [1] TLS13ExtensionType,
@@ -1392,7 +1393,7 @@ TLS13Certificate ::= SEQUENCE


-- RFC 8446, clause 4.2.9: Preshared key exchange mode.
TLS13PSKeyExchangeMode ::= ENUMERATED
TLS13PSKKeyExchangeMode ::= ENUMERATED
{
    pSKKE(1),
    pSKDHEKE(2)
@@ -1414,13 +1415,13 @@ TLS13OfferedPSK ::= SEQUENCE
}

-- Actual TLS PSK, either explicitly provisioned or derived from
-- an earlier issued TLS ticket and a resumptionMasterSecret.
-- For AKMA, the PSK is the AKMA key K_AF.
TLS13PSKInfo ::= SEQUENCE
{
    pSKIdentity        [1] TLS13PSKIdentity,
    pSKValue           [2] OCTET STRING,
    pSKValue           [2] OCTET STRING,
    pSKKeyExchangeMode [3] TLS13PSKKeyExchangeMode,
    hashAlgorithm      [4] TLS13PSKHashAlgorithm
}

@@ -1439,7 +1440,7 @@ TLS13NewSessionTicket ::= SEQUENCE



-- RFC8446, clause 7.1 and 4.2.8: TLS-internal leys
-- RFC8446, clause 7.1 and 4.2.8: TLS-internal keys
-- These keys/secrets are never directly used to encrypt
-- data, and are therefore optional to provide as part of
-- TLS13UAStarParams.
@@ -1456,8 +1457,8 @@ TLS13EstablishedSecrets ::= SEQUENCE


-- RFC8446, clause 7.1
-- The actual encryption keys are derived from the respective
-- secret values below and a provided hashed handshake-message-transcript.
-- The actual encryption keys are derived from the respective secret
-- values below and the provided hashed handshake-message-transcript.
TLS13EarlySecretInfo ::= SEQUENCE
{
    earlySecretValue [1] OCTET STRING (SIZE(1..65535)),
@@ -1482,8 +1483,8 @@ TLS13MasterSecretInfo ::= SEQUENCE
}


-- Complete TLS 1.3 cryptographic context, all inline
-- references below are to clauses of RFC8446.
-- Complete TLS 1.3 cryptographic context.

TLS13UAStarParams ::= SEQUENCE
{
    -- Basic cryptographic information.
@@ -1492,12 +1493,12 @@ TLS13UAStarParams ::= SEQUENCE
    -- parameters are also provided as part of client and
    -- server extensions below.
    --
    -- PSKs and key exchange modes offered by the client
    -- PSKs and key exchange modes offered by the client, see
    -- clause 4.2.9, 4.2.11. When AKMA (or other CSP-provided)
    -- keys are used, at least one offered PSK and key exchange mode
    -- will always be present in the client extensions
    offeredPSKs                      [1] SEQUENCE OF TLS13OfferedPSK,
    offeredPSKKeyExchangeModes       [2] SEQUENCE OF TLS13PSKeyExchangeMode,
    offeredPSKKeyExchangeModes       [2] SEQUENCE OF TLS13PSKKeyExchangeMode,
    -- The server-selected PSK, clause 4.2.11
    -- selectedPSKIdentity = j means the server selects j:th offered PSK.
    selectedPSKIdentity              [3] INTEGER (0..65535),
@@ -1520,7 +1521,7 @@ TLS13UAStarParams ::= SEQUENCE
    -- Encrypted server extensions, clause 4.3.1 (here provided in plaintext).
    tLSPlaintextEncryptedExtensions [15] SEQUENCE OF TLS13Extension OPTIONAL,
    -- Authentication related parameters, clause 4.4
    -- Certifcates are encrypted between client and server,
    -- Certificates are encrypted between client and server,
    -- these are the unencrypted certificate(s).
    tLSPlaintextClientCertificate   [16] TLS13Certificate OPTIONAL,
    tLSPlaintextServerCertificate   [17] TLS13Certificate OPTIONAL,
@@ -1531,7 +1532,7 @@ TLS13UAStarParams ::= SEQUENCE
    -- derived from clientEarlyTrafficSecret as described in clause 7.3.
    clientEarlyTrafficSecret        [20] OCTET STRING (SIZE(1..65535)),
    earlyExporterMasterSecret       [21] OCTET STRING (SIZE(1..65535)),
    -- Establised shared key (from Diffie-Hellman or similar).
    -- Established shared key (from Diffie-Hellman or similar).
    sharedKey                       [22] TLS13EstablishedSecrets OPTIONAL,
    handshakeSecret                 [23] TLS13HandshakeSecretInfo OPTIONAL,
    -- The keys used by the cipher suite to encrypt the handshake are