diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 723948f8486213215a246147872d922a47346142..5c540076f00418511e59ecdf20f4afa8db8e9e9f 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version7(7)} DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version6(6)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version7(7)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -253,7 +253,8 @@ CCPDU ::= CHOICE { uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, - mMSCCPDU [3] MMSCCPDU + mMSCCPDU [3] MMSCCPDU, + pTCCCPDU [4] PTCCCPDU } -- =========================== @@ -1704,6 +1705,11 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } +-- ========= +-- PTC CCPDU +-- ========= + +PTCCCPDU ::= OCTET STRING -- ================= -- 5G PTC parameters diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index c707b84e44cd2475ac0eca771ec6c11f2d0793a5..99957b66773303cb5ec74838487b51fae770bc35 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -143,7 +143,7 @@ - + diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e60115d0cde2284a19480c43230fe447b9d52..dc00dcb01810936de3b6cc4bb42d273a9e640e06 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1,5 +1,5 @@ TS33128Payloads -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version0(0)} +{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 ::= @@ -9,7 +9,7 @@ BEGIN -- Relative OIDs -- ============= -tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version0(0)} +tS33128PayloadsOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version1(1)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -114,8 +114,8 @@ XIRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssocation [62] AMFIdentifierAssocation, - mMEIdentifierAssocation [63] MMEIdentifierAssocation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -146,14 +146,28 @@ XIRIEvent ::= CHOICE sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - --EPS Events, see clause 6.3 + -- EPS Events, see clause 6.3 - --MME Events, see clause 6.3.2.2 + -- MME Events, see clause 6.3.2.2 mMEAttach [87] MMEAttach, mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + + -- AKMA key management events, see clause 7.9.1 + aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister, + aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, + aAnFAKMAContextRemovalRecord [95] AAnFAKMAContextRemovalRecord, + aFAKMAApplicationKeyRefresh [96] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [97] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [99] AFApplicationKeyRemoval, + + -- HR LI Events, see clause 7.10.3.3 + n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, + s8HRBearerInfo [101] S8HRBearerInfo } -- ============== @@ -261,8 +275,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssocation [62] AMFIdentifierAssocation, - mMEIdentifierAssocation [63] MMEIdentifierAssocation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -293,14 +307,27 @@ IRIEvent ::= CHOICE sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - --EPS Events, see clause 6.3 + -- EPS Events, see clause 6.3 - --MME Events, see clause 6.3.2.2 + -- MME Events, see clause 6.3.2.2 mMEAttach [87] MMEAttach, mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + + -- AKMA key management events, see clause 7.9.1 + aAnFAnchorKeyRegister [92] AAnFAnchorKeyRegister, + aAnFKAKMAApplicationKeyGet [93] AAnFKAKMAApplicationKeyGet, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [94] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, + aAnFAKMAContextRemovalRecord [95] AAnFAKMAContextRemovalRecord, + aFAKMAApplicationKeyRefresh [96] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [97] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [98] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [99] AFApplicationKeyRemoval + + -- tag 100 is reserved because there is no equivalent n9HRPDUSessionInfo in IRIEvent. + -- tag 101 is reserved because there is no equivalent S8HRBearerInfo in IRIEvent. } IRITargetIdentifier ::= SEQUENCE @@ -324,7 +351,8 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, - nIDDCCPDU [4] NIDDCCPDU + nIDDCCPDU [4] NIDDCCPDU, + pTCCCPDU [5] PTCCCPDU } -- =========================== @@ -341,6 +369,59 @@ LINotificationMessage ::= CHOICE { lINotification [1] LINotification } + +-- ================= +-- HR LI definitions +-- ================= + +N9HRPDUSessionInfo ::= SEQUENCE +{ + sUPI [1] SUPI, + pEI [2] PEI OPTIONAL, + pDUSessionID [3] PDUSessionID, + location [4] Location OPTIONAL, + sNSSAI [5] SNSSAI OPTIONAL, + dNN [6] DNN OPTIONAL, + messageCause [7] N9HRMessageCause +} + +S8HRBearerInfo ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + bearerID [3] EPSBearerID, + linkedBearerID [4] EPSBearerID OPTIONAL, + location [5] Location OPTIONAL, + aPN [6] APN OPTIONAL, + sGWIPAddress [7] IPAddress OPTIONAL, + messageCause [8] S8HRMessageCause +} + +-- ================ +-- HR LI parameters +-- ================ + +N9HRMessageCause ::= ENUMERATED +{ + pDUSessionEstablished(1), + pDUSessionModified(2), + pDUSessionReleased(3), + updatedLocationAvailable(4), + sMFChanged(5), + other(6) +} + +S8HRMessageCause ::= ENUMERATED +{ + bearerActivated(1), + bearerModified(2), + bearerDeleted(3), + pDNDisconnected(4), + updatedLocationAvailable(5), + sGWChanged(6), + other(7) +} + -- ================== -- 5G NEF definitions -- ================== @@ -814,6 +895,191 @@ EPSBearerID ::= INTEGER (0..255) APN ::= UTF8String +-- ======================= +-- AKMA AAnF definitions +-- ======================= + +AAnFAnchorKeyRegister ::= SEQUENCE +{ + aKID [1] NAI, + sUPI [2] SUPI, + kAKMA [3] KAKMA OPTIONAL +} + +AAnFKAKMAApplicationKeyGet ::= SEQUENCE +{ + type [1] KeyGetType, + aKID [2] NAI, + keyInfo [3] AFKeyInfo +} + +AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial ::= SEQUENCE +{ + aKID [1] NAI, + kAKMA [2] KAKMA OPTIONAL, + aFKeyList [3] SEQUENCE OF AFKeyInfo OPTIONAL +} + +AAnFAKMAContextRemovalRecord ::= SEQUENCE +{ + aKID [1] NAI, + nFID [2] NFID +} + +-- ====================== +-- AKMA common parameters +-- ====================== + +FQDN ::= UTF8String + +NFID ::= UTF8String + +UAProtocolID ::= OCTET STRING (SIZE(5)) + +AKMAAFID ::= SEQUENCE +{ + aFFQDN [1] FQDN, + uaProtocolID [2] UAProtocolID +} + +UAStarParams ::= CHOICE +{ + tls12 [1] TLS12UAStarParams, + generic [2] GenericUAStarParams +} + +GenericUAStarParams ::= SEQUENCE +{ + genericClientParams [1] OCTET STRING, + genericServerParams [2] OCTET STRING +} + +-- =========================================== +-- Specific UaStarParmas for TLS 1.2 (RFC5246) +-- =========================================== + +TLSCipherType ::= ENUMERATED +{ + stream(1), + block(2), + aead(3) +} + +TLSCompressionAlgorithm ::= ENUMERATED +{ + null(1), + deflate(2) +} + +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 [10] INTEGER (0..255), + macKeyLength [11] INTEGER (0..255), + compressionAlgorithm [12] TLSCompressionAlgorithm, + clientRandom [13] OCTET STRING (SIZE(4)), + serverRandom [14] OCTET STRING (SIZE(4)), + clientSequenceNumber [15] INTEGER, + serverSequenceNumber [16] INTEGER, + sessionID [17] OCTET STRING (SIZE(0..32)), + tLSExtensions [18] OCTET STRING (SIZE(0..65535)) +} + +KAF ::= OCTET STRING + +KAKMA ::= OCTET STRING + +-- ==================== +-- AKMA AAnF parameters +-- ==================== + +KeyGetType ::= ENUMERATED +{ + internal(1), + external(2) +} + +AFKeyInfo ::= SEQUENCE +{ + aFID [1] AKMAAFID, + kAF [2] KAF, + kAFExpTime [3] KAFExpiryTime +} + +-- ======================= +-- AKMA AF definitions +-- ======================= + +AFAKMAApplicationKeyRefresh ::= SEQUENCE +{ + aFID [1] AFID, + aKID [2] NAI, + kAF [3] KAF, + uaStarParams [4] UAStarParams OPTIONAL +} + +AFStartOfInterceptWithEstablishedAKMAApplicationKey ::= SEQUENCE +{ + aFID [1] FQDN, + aKID [2] NAI, + kAFParamList [3] SEQUENCE OF AFSecurityParams +} + +AFAuxiliarySecurityParameterEstablishment ::= SEQUENCE +{ + aFSecurityParams [1] AFSecurityParams +} + +AFSecurityParams ::= SEQUENCE +{ + aFID [1] AFID, + aKID [2] NAI, + kAF [3] KAF, + uaStarParams [4] UAStarParams +} + +AFApplicationKeyRemoval ::= SEQUENCE +{ + aFID [1] AFID, + aKID [2] NAI, + removalCause [3] AFKeyRemovalCause +} + +-- =================== +-- AKMA AF parameters +-- =================== + +KAFParams ::= SEQUENCE +{ + aKID [1] NAI, + kAF [2] KAF, + kAFExpTime [3] KAFExpiryTime, + uaStarParams [4] UAStarParams +} + +KAFExpiryTime ::= GeneralizedTime + +AFKeyRemovalCause ::= ENUMERATED +{ + unknown(1), + keyExpiry(2), + applicationSpecific(3) +} -- ================== -- 5G AMF definitions @@ -835,7 +1101,9 @@ AMFRegistration ::= SEQUENCE fiveGSTAIList [11] TAIList OPTIONAL, sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL, oldGUTI [13] EPS5GGUTI OPTIONAL, - eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL + eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL, + nonIMEISVPEI [15] NonIMEISVPEI OPTIONAL, + mACRestIndicator [16] MACRestrictionIndicator OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -2260,6 +2528,11 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } +-- ========= +-- PTC CCPDU +-- ========= + +PTCCCPDU ::= OCTET STRING -- ================= -- 5G PTC parameters @@ -2521,7 +2794,7 @@ PDSRSummaryTrigger ::= ENUMERATED -- Identifier Association definitions -- ================================== -AMFIdentifierAssocation ::= SEQUENCE +AMFIdentifierAssociation ::= SEQUENCE { sUPI [1] SUPI, sUCI [2] SUCI OPTIONAL, @@ -2532,7 +2805,7 @@ AMFIdentifierAssocation ::= SEQUENCE fiveGSTAIList [7] TAIList OPTIONAL } -MMEIdentifierAssocation ::= SEQUENCE +MMEIdentifierAssociation ::= SEQUENCE { iMSI [1] IMSI, iMEI [2] IMEI OPTIONAL, @@ -2883,6 +3156,13 @@ IPv6FlowLabel ::= INTEGER(0..1048575) MACAddress ::= OCTET STRING (SIZE(6)) +MACRestrictionIndicator ::= ENUMERATED +{ + noResrictions(1), + mACAddressNotUseableAsEquipmentIdentifier(2), + unknown(3) +} + MCC ::= NumericString (SIZE(3)) MNC ::= NumericString (SIZE(2..3)) @@ -2909,6 +3189,11 @@ NonLocalID ::= ENUMERATED nonLocal(2) } +NonIMEISVPEI ::= CHOICE +{ + mACAddress [1] MACAddress +} + NSSAI ::= SEQUENCE OF SNSSAI PLMNID ::= SEQUENCE diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 4764bc745cbb3c5fea4bd39143fe164a04ff73a8..d824321919ea14aa9e0285dd2720538e6b9b8e23 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ @@ -143,7 +143,7 @@ - + diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bb8de4325f0736ef81c2aa4a3d88cb63de311e0c..2a89264314fc125b1b16660797a6e126b2bcd47c 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,9 +1,12 @@ + + @@ -11,8 +14,8 @@ - - + + @@ -59,16 +62,16 @@ - - + + - - + + @@ -175,24 +178,12 @@ - - + + - - - - - - - - - - - - @@ -245,4 +236,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file