Commit 579c8ac4 authored by canterburym's avatar canterburym
Browse files

Update from s3i210422r1

parent c699ef4c
Loading
Loading
Loading
Loading
Loading
+55 −5
Original line number Diff line number Diff line
TS33128Payloads
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version1(1)}
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version1(1)}}

DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=

@@ -165,6 +165,7 @@ XIRIEvent ::= CHOICE
    aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey,
    aFAuxiliarySecurityParameterEstablishment           [1008] AFAuxiliarySecurityParameterEstablishment,
    aFApplicationKeyRemoval                             [1009] AFApplicationKeyRemoval

}

-- ==============
@@ -884,7 +885,56 @@ AKMAAFID ::= SEQUENCE
   uaProtocolID          [2] UAProtocolID
}

UAStarParams ::= OCTET STRING
UAStarParams ::== CHOICE
{
   tls12                 [1] TLS12UAStarParams,
   generic               [2] GenericUAStarParams
}

GenericUAStarParams ::== OCTET STRING

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

TLSCIPHERTYPE ::== ENUMERATED
{
    stream(1),
    block(2),
    aead(3)
}

TLSCOMPRESSIONALGORITHM ::== ENUMERATED
{
   null(0),
   deflate(1)
}

TLSPRFALGORITHM ::== ENUMERATED
{
   rfc5246(1)
}

TLSCIPHERSUITE ::== SEQUENCE (SIZE(2)) OF INTEGER (0..255)

TLS12UAStarParams ::== SEQUENCE
{ 
   preMasterSecret       [1] OCTET STRING (SIZE(6)) OPTIONAL,
   masterSecret          [2] OCTET STRING (SIZE(6)),  
   pRFAlgorithm          [3] TLSPRFALGORITHM,
   cipherSuite           [4] TLSCIPHERSUITE,
   cipherType            [5] TLSCIPHERTYPE,
   encKeyLength          [6] INTEGER (0..255),
   blockLength           [7] INTEGER (0..255),
   fixedIVLength         [8] INTEGER (0..255),
   recordIVLength        [9] INTEGER (0..255),
   macLength            [11] INTEGER (0..255),
   macKeyLength         [12] INTEGER (0..255),
   compressionAlgorithm [13] TLSCOMPRESSIONALGORITHM,
   clientRandom         [14] OCTET STRING (SIZE(4)),
   serverRandom         [15] OCTET STRING (SIZE(4))
   sequenceNumber       [16] INTEGER (0..2^64-1)
}

KAF ::= OCTET STRING

@@ -969,7 +1019,7 @@ KAFExpiryTime ::= GeneralizedTime

AFKeyRemovalCause ::= ENUMERATED
{
    unknown(1),
    unknown(0),
    keyExpiry(2),
    applicationSpecific(3)
}