From 07e5fe00f1aaf7b37b8e5f6b091d458c50f9af00 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Jul 2021 19:34:26 +0200 Subject: [PATCH 01/41] Correcting "assocation" as part of s3i210414 --- 33128/r17/TS33128Payloads.asn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e601..0d3c4de 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -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, @@ -261,8 +261,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, @@ -2521,7 +2521,7 @@ PDSRSummaryTrigger ::= ENUMERATED -- Identifier Association definitions -- ================================== -AMFIdentifierAssocation ::= SEQUENCE +AMFIdentifierAssociation ::= SEQUENCE { sUPI [1] SUPI, sUCI [2] SUCI OPTIONAL, @@ -2532,7 +2532,7 @@ AMFIdentifierAssocation ::= SEQUENCE fiveGSTAIList [7] TAIList OPTIONAL } -MMEIdentifierAssocation ::= SEQUENCE +MMEIdentifierAssociation ::= SEQUENCE { iMSI [1] IMSI, iMEI [2] IMEI OPTIONAL, -- GitLab From 29ad85eabe38b36f809010dc494d50a0ec3f624a Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 2 Jul 2021 20:01:25 +0200 Subject: [PATCH 02/41] Updating OIDs and correcting whitespace --- 33128/r17/TS33128Payloads.asn | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0d3c4de..6899f77 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 - aMFIdentifierAssociation [62] AMFIdentifierAssociation, - mMEIdentifierAssociation [63] MMEIdentifierAssociation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, @@ -261,8 +261,8 @@ IRIEvent ::= CHOICE unsuccessfulMASMProcedure [61] SMFMAUnsuccessfulProcedure, -- Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2 - aMFIdentifierAssociation [62] AMFIdentifierAssociation, - mMEIdentifierAssociation [63] MMEIdentifierAssociation, + aMFIdentifierAssociation [62] AMFIdentifierAssociation, + mMEIdentifierAssociation [63] MMEIdentifierAssociation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, -- GitLab From db52bdb2ae93ec907efc5c8d9ab599fbcfdaaabc Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 5 Jul 2021 18:17:33 +0200 Subject: [PATCH 03/41] Update urn_3GPP_ns_li_3GPPX1Extensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 33 +++++++------------ 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bb8de43..126cf10 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,9 +1,12 @@ + + @@ -11,7 +14,7 @@ - + @@ -59,16 +62,16 @@ - - + + - - + + @@ -175,24 +178,12 @@ - - + + - - - - - - - - - - - - -- GitLab From 441b6e95de0ae675cea0054c3c36452b73254a76 Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 6 Jul 2021 17:40:45 +0200 Subject: [PATCH 04/41] AKMA changes --- 33128/r17/TS33128Payloads.asn | 165 +++++++++++++++++++++++++++++++++- 1 file changed, 162 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e601..e01bb9a 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -153,7 +153,18 @@ XIRIEvent ::= CHOICE mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + + -- AKMA key management events, see clause 7.X.1 + aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, + aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, + aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, + aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [1008] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [1009] AFApplicationKeyRemoval } -- ============== @@ -300,7 +311,18 @@ IRIEvent ::= CHOICE mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + + -- AKMA key management Events, see clause 7.X.1 + aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, + aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, + aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, + aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [1008] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [1009] AFApplicationKeyRemoval } IRITargetIdentifier ::= SEQUENCE @@ -814,6 +836,143 @@ 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 ::= OCTET STRING + +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 +-- ======================= + +AFAKMAApplicationKeyGet ::= SEQUENCE +{ + aFID [1] AKMAAFID +} + +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(0), + keyExpiry(2), + applicationSpecific(3) +} -- ================== -- 5G AMF definitions @@ -3726,4 +3885,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From 26f4bf2eaac776024559aee417ab42fad07e2451 Mon Sep 17 00:00:00 2001 From: canterburym Date: Tue, 6 Jul 2021 20:47:00 +0200 Subject: [PATCH 05/41] Correcting linting errors --- 33128/r17/TS33128Payloads.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e01bb9a..8cc103a 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -158,7 +158,7 @@ XIRIEvent ::= CHOICE -- AKMA key management events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, @@ -316,7 +316,7 @@ IRIEvent ::= CHOICE -- AKMA key management Events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, @@ -969,7 +969,7 @@ KAFExpiryTime ::= GeneralizedTime AFKeyRemovalCause ::= ENUMERATED { - unknown(0), + unknown(1), keyExpiry(2), applicationSpecific(3) } -- GitLab From 85204aeef291808d7c08bbd872d0352f7b48b990 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 6 Jul 2021 19:57:30 +0100 Subject: [PATCH 06/41] Adding X1 Identity extensions --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bb8de43..b27ae66 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,9 +1,12 @@ + + @@ -245,4 +248,12 @@ + + + + + + + + \ No newline at end of file -- GitLab From c699ef4c97978a2c973892ebf957898aab1d187e Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 6 Jul 2021 19:59:38 +0100 Subject: [PATCH 07/41] OIDs and whitespace at module end --- 33128/r17/TS33128Payloads.asn | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 8cc103a..58f8db1 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)} @@ -3885,4 +3885,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file -- GitLab From 579c8ac418775a9f94f37018731cf34f24de3305 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 7 Jul 2021 15:45:28 +0200 Subject: [PATCH 08/41] Update from s3i210422r1 --- 33128/r17/TS33128Payloads.asn | 60 ++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 58f8db1..e13e687 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) 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 ::= @@ -158,13 +158,14 @@ XIRIEvent ::= CHOICE -- AKMA key management events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey, aFAuxiliarySecurityParameterEstablishment [1008] AFAuxiliarySecurityParameterEstablishment, aFApplicationKeyRemoval [1009] AFApplicationKeyRemoval + } -- ============== @@ -316,7 +317,7 @@ IRIEvent ::= CHOICE -- AKMA key management Events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, @@ -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) } -- GitLab From 41c0434a1e9b724d525c2c3d3c7d9e2ed824fc19 Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 7 Jul 2021 14:55:48 +0100 Subject: [PATCH 09/41] Syntax and linting corrections --- 33128/r17/TS33128Payloads.asn | 38 +++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e13e687..e2a9539 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) 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 ::= @@ -158,7 +158,7 @@ XIRIEvent ::= CHOICE -- AKMA key management events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, @@ -317,7 +317,7 @@ IRIEvent ::= CHOICE -- AKMA key management Events, see clause 7.X.1 aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial , + aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, @@ -885,55 +885,55 @@ AKMAAFID ::= SEQUENCE uaProtocolID [2] UAProtocolID } -UAStarParams ::== CHOICE +UAStarParams ::= CHOICE { tls12 [1] TLS12UAStarParams, generic [2] GenericUAStarParams } -GenericUAStarParams ::== OCTET STRING +GenericUAStarParams ::= OCTET STRING -- =========================================== -- Specific UaStarParmas for TLS 1.2 (RFC5246) -- =========================================== -TLSCIPHERTYPE ::== ENUMERATED +TLSCipherType ::= ENUMERATED { stream(1), block(2), aead(3) } -TLSCOMPRESSIONALGORITHM ::== ENUMERATED +TLSCompressionAlgorithm ::= ENUMERATED { - null(0), - deflate(1) + null(1), + deflate(2) } -TLSPRFALGORITHM ::== ENUMERATED +TLSPRFAlgorithm ::= ENUMERATED { rfc5246(1) } -TLSCIPHERSUITE ::== SEQUENCE (SIZE(2)) OF INTEGER (0..255) +TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) -TLS12UAStarParams ::== SEQUENCE +TLS12UAStarParams ::= SEQUENCE { preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL, masterSecret [2] OCTET STRING (SIZE(6)), - pRFAlgorithm [3] TLSPRFALGORITHM, - cipherSuite [4] TLSCIPHERSUITE, - cipherType [5] TLSCIPHERTYPE, + 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, + compressionAlgorithm [13] TLSCompressionAlgorithm, clientRandom [14] OCTET STRING (SIZE(4)), - serverRandom [15] OCTET STRING (SIZE(4)) - sequenceNumber [16] INTEGER (0..2^64-1) + serverRandom [15] OCTET STRING (SIZE(4)), + sequenceNumber [16] INTEGER } KAF ::= OCTET STRING @@ -1019,7 +1019,7 @@ KAFExpiryTime ::= GeneralizedTime AFKeyRemovalCause ::= ENUMERATED { - unknown(0), + unknown(1), keyExpiry(2), applicationSpecific(3) } -- GitLab From d2a4692347d35802d582e52eb13e72caeebb7377 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 8 Jul 2021 08:26:48 +0200 Subject: [PATCH 10/41] From s3i210422r2 --- 33128/r17/TS33128Payloads.asn | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index e2a9539..755a060 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -891,7 +891,11 @@ UAStarParams ::= CHOICE generic [2] GenericUAStarParams } -GenericUAStarParams ::= OCTET STRING +GenericUAStarParams ::= SEQUENCE +{ + genericClientParams [1] OCTET STRING, + genericServerParams [2] OCTET STRING +} -- =========================================== -- Specific UaStarParmas for TLS 1.2 (RFC5246) @@ -932,8 +936,11 @@ TLS12UAStarParams ::= SEQUENCE macKeyLength [12] INTEGER (0..255), compressionAlgorithm [13] TLSCompressionAlgorithm, clientRandom [14] OCTET STRING (SIZE(4)), - serverRandom [15] OCTET STRING (SIZE(4)), - sequenceNumber [16] INTEGER + serverRandom [15] OCTET STRING (SIZE(4)) + clientSequenceNumber [16] INTEGER, + serverSequenceNumber [17] INTEGER, + sessionID [18] OCTET STRING (SIZE(0..32)), + tLSextensions [19] OCTET STRING (SIZE(0..65535)) } KAF ::= OCTET STRING -- GitLab From 99f8660be66c19909493820c9b0f67c2fdbbe613 Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 8 Jul 2021 08:36:19 +0200 Subject: [PATCH 11/41] Missing comma --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 755a060..a9b2fb6 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -936,7 +936,7 @@ TLS12UAStarParams ::= SEQUENCE macKeyLength [12] INTEGER (0..255), compressionAlgorithm [13] TLSCompressionAlgorithm, clientRandom [14] OCTET STRING (SIZE(4)), - serverRandom [15] OCTET STRING (SIZE(4)) + serverRandom [15] OCTET STRING (SIZE(4)), clientSequenceNumber [16] INTEGER, serverSequenceNumber [17] INTEGER, sessionID [18] OCTET STRING (SIZE(0..32)), -- GitLab From ff80ee23dcda48b20e3822b774af557adf086012 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 14 Jul 2021 15:10:24 +0200 Subject: [PATCH 12/41] Update 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 126cf10..7a69411 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,7 +1,7 @@ @@ -62,16 +62,16 @@ - - + + - - + + @@ -178,8 +178,8 @@ - - + + @@ -236,4 +236,4 @@ - \ No newline at end of file + -- GitLab From ecfb079f258c2141e556b6c98c545ab63e2a6e2a Mon Sep 17 00:00:00 2001 From: canterburym Date: Thu, 15 Jul 2021 10:15:59 +0200 Subject: [PATCH 13/41] From draft_s3i201422-r3 --- 33128/r17/TS33128Payloads.asn | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index a9b2fb6..fa30d55 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -160,11 +160,10 @@ XIRIEvent ::= CHOICE aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, - aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, - aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, - aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey, - aFAuxiliarySecurityParameterEstablishment [1008] AFAuxiliarySecurityParameterEstablishment, - aFApplicationKeyRemoval [1009] AFApplicationKeyRemoval + aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [1008] AFApplicationKeyRemoval } @@ -319,11 +318,11 @@ IRIEvent ::= CHOICE aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, - aFAKMAApplicationKeyGet [1005] AFAKMAApplicationKeyGet, - aFAKMAApplicationKeyRefresh [1006] AFAKMAApplicationKeyRefresh, - aFStartOfInterceptWithEstablishedAKMAApplicationKey [1007] AFStartOfInterceptWithEstablishedAKMAApplicationKey, - aFAuxiliarySecurityParameterEstablishment [1008] AFAuxiliarySecurityParameterEstablishment, - aFApplicationKeyRemoval [1009] AFApplicationKeyRemoval + aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh, + aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey, + aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment, + aFApplicationKeyRemoval [1008] AFApplicationKeyRemoval + } IRITargetIdentifier ::= SEQUENCE @@ -885,6 +884,7 @@ AKMAAFID ::= SEQUENCE uaProtocolID [2] UAProtocolID } + UAStarParams ::= CHOICE { tls12 [1] TLS12UAStarParams, @@ -940,7 +940,7 @@ TLS12UAStarParams ::= SEQUENCE clientSequenceNumber [16] INTEGER, serverSequenceNumber [17] INTEGER, sessionID [18] OCTET STRING (SIZE(0..32)), - tLSextensions [19] OCTET STRING (SIZE(0..65535)) + tLSExtensions [19] OCTET STRING (SIZE(0..65535)) } KAF ::= OCTET STRING @@ -970,10 +970,6 @@ AFKeyInfo ::= SEQUENCE -- AKMA AF definitions -- ======================= -AFAKMAApplicationKeyGet ::= SEQUENCE -{ - aFID [1] AKMAAFID -} AFAKMAApplicationKeyRefresh ::= SEQUENCE { @@ -1031,6 +1027,7 @@ AFKeyRemovalCause ::= ENUMERATED applicationSpecific(3) } + -- ================== -- 5G AMF definitions -- ================== -- GitLab From cda907c0247cbcd3cbc0734c28beddb1d1497c94 Mon Sep 17 00:00:00 2001 From: hawbaker Date: Thu, 15 Jul 2021 13:59:21 +0200 Subject: [PATCH 14/41] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e601..7f588c9 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) version10(10)} 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) version10(10)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -835,7 +835,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 @@ -2883,6 +2885,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 +2918,11 @@ NonLocalID ::= ENUMERATED nonLocal(2) } +NonIMEISVPEI ::= CHOICE +{ + mACAddress [1] MACAddress +} + NSSAI ::= SEQUENCE OF SNSSAI PLMNID ::= SEQUENCE @@ -3726,4 +3740,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From e146fd92e62495a1320cf9f969059932434dadf8 Mon Sep 17 00:00:00 2001 From: grayje Date: Thu, 15 Jul 2021 15:10:47 +0200 Subject: [PATCH 15/41] Update TS33128Payloads.asn --- 33128/r16/TS33128Payloads.asn | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 723948f..6a2759b 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -253,7 +253,9 @@ CCPDU ::= CHOICE { uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, - mMSCCPDU [3] MMSCCPDU + mMSCCPDU [3] MMSCCPDU, + pTCCCPDU [4] PTCCCPDU + } -- =========================== @@ -1704,6 +1706,12 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } +-- ================= +-- PTC CCPDU +-- ================= + +PTCCCPDU ::= OCTET STRING + -- ================= -- 5G PTC parameters -- GitLab From 458a1d60680e166e86956e5f8e39c7e43e573b92 Mon Sep 17 00:00:00 2001 From: grayje Date: Thu, 15 Jul 2021 15:24:10 +0200 Subject: [PATCH 16/41] Update TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e601..1971815 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -324,7 +324,8 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, - nIDDCCPDU [4] NIDDCCPDU + nIDDCCPDU [4] NIDDCCPDU, + pTCCCPDU [5] PTCCCPDU } -- =========================== @@ -2261,6 +2262,12 @@ PTCAccessPolicy ::= SEQUENCE } +-- ================= +-- PTC CCPDU +-- ================= + +PTCCCPDU ::= OCTET STRING + -- ================= -- 5G PTC parameters -- ================= -- GitLab From f75bdf3f36928df9d11e0d3f4aa502f3c7fdac0c Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 23 Aug 2021 14:37:08 +0200 Subject: [PATCH 17/41] Changing TAC definition to pass 4 or 6 hex digits --- 33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index c707b84..d841eee 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -143,7 +143,7 @@ - + -- GitLab From 467a96a7c752bbfb95df3d51baf86646321771a7 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 23 Aug 2021 14:39:06 +0200 Subject: [PATCH 18/41] Doesn't appear to like ?: syntax... --- 33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index d841eee..4b1e0b4 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -143,7 +143,7 @@ - + -- GitLab From 057da1e9c07dc9da00612efa21bde7041a73b3ed Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 23 Aug 2021 14:46:06 +0200 Subject: [PATCH 19/41] Update urn_3GPP_ns_li_3GPPIdentityExtensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 4764bc7..1afceff 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -143,7 +143,7 @@ - + -- GitLab From 38de999cb31ad769fbf9539d514de12fe6178c97 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 25 Aug 2021 08:48:02 +0200 Subject: [PATCH 20/41] From s3i210632 pre-meeting draft --- 33128/r17/TS33128Payloads.asn | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 0a9e601..7c406b3 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -153,7 +153,9 @@ XIRIEvent ::= CHOICE mMEDetach [88] MMEDetach, mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + n9HRPDUSessionInfo [2491] N9HRPDUSessionInfo, + s8HRBearerInfo [2492] S8HRBearerInfo } -- ============== @@ -341,6 +343,32 @@ LINotificationMessage ::= CHOICE { lINotification [1] LINotification } + +-- ================== +-- HR LI definitions +-- ================== + +N9HRPDUSessionInfo ::= SEQUENCE +{ + sUPI [1] SUPI, + pEI [2] PEI OPTIONAL, + pDUSessionID [3] PDUSessionID, + sNSSAI [4] SNSSAI OPTIONAL, + location [5] Location OPTIONAL, + dNN [6] DNN OPTIONAL + } + +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 +} + -- ================== -- 5G NEF definitions -- ================== @@ -3726,4 +3754,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From 7f8aafb66a562085bc93f7777efff6cb1f81bfd0 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 25 Aug 2021 08:51:25 +0200 Subject: [PATCH 21/41] Fixing linting errors --- 33128/r17/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 7c406b3..b51f87a 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -355,8 +355,8 @@ N9HRPDUSessionInfo ::= SEQUENCE pDUSessionID [3] PDUSessionID, sNSSAI [4] SNSSAI OPTIONAL, location [5] Location OPTIONAL, - dNN [6] DNN OPTIONAL - } + dNN [6] DNN OPTIONAL +} S8HRBearerInfo ::= SEQUENCE { -- GitLab From e7b3a2b83ddc9769b9c785f7084b1bf59d2fb975 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 25 Aug 2021 08:59:21 +0200 Subject: [PATCH 22/41] From s3i210633 pre-meeting draft --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bb8de43..9be529f 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -245,4 +245,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- GitLab From b049b747ec32cd00fd6c7015641ed4b916e9f55d Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 25 Aug 2021 09:01:01 +0200 Subject: [PATCH 23/41] Correcting missing --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 1 + 1 file changed, 1 insertion(+) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 9be529f..bf92783 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -254,6 +254,7 @@ + -- GitLab From 6d12168ddee9fe00c3aa84aa35d8091a33185638 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 10:12:15 +0200 Subject: [PATCH 24/41] Updated from latest draft --- 33128/r17/TS33128Payloads.asn | 38 ++++++++++++++++++++++++++++++----- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index b51f87a..169cdfe 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -154,6 +154,8 @@ XIRIEvent ::= CHOICE mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure, + + --HR LI Events, see clause 7.X.3.3 n9HRPDUSessionInfo [2491] N9HRPDUSessionInfo, s8HRBearerInfo [2492] S8HRBearerInfo } @@ -303,6 +305,9 @@ IRIEvent ::= CHOICE mMELocationUpdate [89] MMELocationUpdate, mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + + -- tag 2491 is reserved because there is no equivalent IRI for the xIRI n9HRPDUSessionInfo + -- tag 2492 is reserved because there is no equivalent IRI for the xIRI S8HRBearerInfo } IRITargetIdentifier ::= SEQUENCE @@ -353,9 +358,10 @@ N9HRPDUSessionInfo ::= SEQUENCE sUPI [1] SUPI, pEI [2] PEI OPTIONAL, pDUSessionID [3] PDUSessionID, - sNSSAI [4] SNSSAI OPTIONAL, - location [5] Location OPTIONAL, - dNN [6] DNN OPTIONAL + location [4] Location OPTIONAL, + sNSSAI [5] SNSSAI OPTIONAL, + dNN [6] DNN OPTIONAL, + messageCause [7] N9HRMessageCause } S8HRBearerInfo ::= SEQUENCE @@ -366,7 +372,29 @@ S8HRBearerInfo ::= SEQUENCE linkedBearerID [4] EPSBearerID OPTIONAL, location [5] Location OPTIONAL, aPN [6] APN OPTIONAL, - sGWIPAddress [7] IPAddress + sGWIPAddress [7] IPAddress OPTIONAL, + messageCause [8] S8HRMessageCause +} + +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) } -- ================== @@ -3754,4 +3782,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file -- GitLab From 25dbd5ef91b5faa191f40898fcbf4b43f185e99d Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 10:19:08 +0200 Subject: [PATCH 25/41] Update TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 169cdfe..97da128 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -388,7 +388,7 @@ N9HRMessageCause ::= ENUMERATED S8HRMessageCause ::= ENUMERATED { - bearerActivated[1], + bearerActivated(1), bearerModified(2), bearerDeleted(3), pDNDisconnected(4) -- GitLab From 466658fa1cfda3de29cf53414215e5af6a8bf7dd Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 10:21:32 +0200 Subject: [PATCH 26/41] Update TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 97da128..4a2f969 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -391,7 +391,7 @@ S8HRMessageCause ::= ENUMERATED bearerActivated(1), bearerModified(2), bearerDeleted(3), - pDNDisconnected(4) + pDNDisconnected(4), updatedLocationAvailable(5), sGWChanged(6), other(7) -- GitLab From 5a6119867800e24c672664e1969d9a24344671f1 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 10:32:41 +0200 Subject: [PATCH 27/41] Update TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 4a2f969..1003d8b 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -349,9 +349,9 @@ LINotificationMessage ::= CHOICE lINotification [1] LINotification } --- ================== +-- ================= -- HR LI definitions --- ================== +-- ================= N9HRPDUSessionInfo ::= SEQUENCE { @@ -376,6 +376,10 @@ S8HRBearerInfo ::= SEQUENCE messageCause [8] S8HRMessageCause } +-- ================ +-- HR LI parameters +-- ================ + N9HRMessageCause ::= ENUMERATED { pDUSessionEstablished(1), -- GitLab From e109df10b489e87379a322d6e4910718ee1031dc Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 11:29:23 +0200 Subject: [PATCH 28/41] Update urn_3GPP_ns_li_3GPPX1Extensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index bf92783..2b5b31a 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -53,7 +53,7 @@ - + @@ -248,6 +248,8 @@ + + @@ -256,6 +258,7 @@ + @@ -277,5 +280,6 @@ - + + \ No newline at end of file -- GitLab From 441a3c2c1c8d245964a68e94c509efeecdb4cb55 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 3 Sep 2021 13:23:14 +0200 Subject: [PATCH 29/41] Update urn_3GPP_ns_li_3GPPX1Extensions.xsd --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 3 --- 1 file changed, 3 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 2b5b31a..f0700c9 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -248,8 +248,6 @@ - - @@ -258,7 +256,6 @@ - -- GitLab From 78061eb8a97ddc6ee9825381448d26d6621d9edd Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 13 Sep 2021 13:57:11 +0200 Subject: [PATCH 30/41] Updated from s3i210494 --- 33128/r16/TS33128Payloads.asn | 923 +++++++++++++++++++++++++++++++--- 1 file changed, 855 insertions(+), 68 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 6a2759b..22c85fc 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) r17(17) version0(0)} 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) r17(17) version0(0)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -117,8 +117,43 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 - sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, + + -- NEF services related events, see clause 7.7.2 + nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, + nEFPDUSessionModification [66] NEFPDUSessionModification, + nEFPDUSessionRelease [67] NEFPDUSessionRelease, + nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, + nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, + nEFdeviceTrigger [70] NEFDeviceTrigger, + nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, + nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, + nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, + nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, + nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, + + -- SCEF services related events, see clause 7.8.2 + sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, + sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, + sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, + sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, + sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, + sCEFdeviceTrigger [81] SCEFDeviceTrigger, + sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, + sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, + sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, + sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, + sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, + + --EPS Events, see clause 6.3 + + --MME Events, see clause 6.3.2.2 + mMEAttach [87] MMEAttach, + mMEDetach [88] MMEDetach, + mMELocationUpdate [89] MMELocationUpdate, + mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure } -- ============== @@ -230,7 +265,42 @@ IRIEvent ::= CHOICE mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 - sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, + + -- NEF services related events, see clause 7.7.2, + nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, + nEFPDUSessionModification [66] NEFPDUSessionModification, + nEFPDUSessionRelease [67] NEFPDUSessionRelease, + nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, + nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, + nEFdeviceTrigger [70] NEFDeviceTrigger, + nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, + nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, + nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, + nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, + nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, + + -- SCEF services related events, see clause 7.8.2 + sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, + sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, + sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, + sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, + sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, + sCEFdeviceTrigger [81] SCEFDeviceTrigger, + sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, + sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, + sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, + sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, + sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, + + --EPS Events, see clause 6.3 + + --MME Events, see clause 6.3.2.2 + mMEAttach [87] MMEAttach, + mMEDetach [88] MMEDetach, + mMELocationUpdate [89] MMELocationUpdate, + mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, + mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure } IRITargetIdentifier ::= SEQUENCE @@ -245,8 +315,8 @@ IRITargetIdentifier ::= SEQUENCE CCPayload ::= SEQUENCE { - cCPayloadOID [1] RELATIVE-OID, - pDU [2] CCPDU + cCPayloadOID [1] RELATIVE-OID, + pDU [2] CCPDU } CCPDU ::= CHOICE @@ -254,8 +324,7 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, - pTCCCPDU [4] PTCCCPDU - + pTCCCPDU [5] PTCCCPDU } -- =========================== @@ -270,9 +339,482 @@ LINotificationPayload ::= SEQUENCE LINotificationMessage ::= CHOICE { - lINotification [1] LINotification + lINotification [1] LINotification +} +-- ================== +-- 5G NEF definitions +-- ================== + +-- See clause 7.7.2.1.2 for details of this structure +NEFPDUSessionEstablishment ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + sNSSAI [4] SNSSAI, + nEFID [5] NEFID, + dNN [6] DNN, + rDSSupport [7] RDSSupport, + sMFID [8] SMFID, + aFID [9] AFID +} + +-- See clause 7.7.2.1.3 for details of this structure +NEFPDUSessionModification ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + sNSSAI [3] SNSSAI, + initiator [4] Initiator, + rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, + rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, + applicationID [7] ApplicationID OPTIONAL, + aFID [8] AFID OPTIONAL, + rDSAction [9] RDSAction OPTIONAL, + serializationFormat [10] SerializationFormat OPTIONAL +} + +-- See clause 7.7.2.1.4 for details of this structure +NEFPDUSessionRelease ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + timeOfFirstPacket [4] Timestamp OPTIONAL, + timeOfLastPacket [5] Timestamp OPTIONAL, + uplinkVolume [6] INTEGER OPTIONAL, + downlinkVolume [7] INTEGER OPTIONAL, + releaseCause [8] NEFReleaseCause +} + +-- See clause 7.7.2.1.5 for details of this structure +NEFUnsuccessfulProcedure ::= SEQUENCE +{ + failureCause [1] NEFFailureCause, + sUPI [2] SUPI, + gPSI [3] GPSI OPTIONAL, + pDUSessionID [4] PDUSessionID, + dNN [5] DNN OPTIONAL, + sNSSAI [6] SNSSAI OPTIONAL, + rDSDestinationPortNumber [7] RDSPortNumber, + applicationID [8] ApplicationID, + aFID [9] AFID +} + +-- See clause 7.7.2.1.6 for details of this structure +NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + pDUSessionID [3] PDUSessionID, + dNN [4] DNN, + sNSSAI [5] SNSSAI, + nEFID [6] NEFID, + rDSSupport [7] RDSSupport, + sMFID [8] SMFID, + aFID [9] AFID +} + +-- See clause 7.7.3.1.1 for details of this structure +NEFDeviceTrigger ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + aFID [4] AFID, + triggerPayload [5] TriggerPayload OPTIONAL, + validityPeriod [6] INTEGER OPTIONAL, + priorityDT [7] PriorityDT OPTIONAL, + sourcePortId [8] PortNumber OPTIONAL, + destinationPortId [9] PortNumber OPTIONAL +} + +-- See clause 7.7.3.1.2 for details of this structure +NEFDeviceTriggerReplace ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + aFID [4] AFID, + triggerPayload [5] TriggerPayload OPTIONAL, + validityPeriod [6] INTEGER OPTIONAL, + priorityDT [7] PriorityDT OPTIONAL, + sourcePortId [8] PortNumber OPTIONAL, + destinationPortId [9] PortNumber OPTIONAL +} + +-- See clause 7.7.3.1.3 for details of this structure +NEFDeviceTriggerCancellation ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID +} + +-- See clause 7.7.3.1.4 for details of this structure +NEFDeviceTriggerReportNotify ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + triggerId [3] TriggerID, + deviceTriggerDeliveryResult [4] DeviceTriggerDeliveryResult +} + +-- See clause 7.7.4.1.1 for details of this structure +NEFMSISDNLessMOSMS ::= SEQUENCE +{ + sUPI [1] SUPI, + gPSI [2] GPSI, + terminatingSMSParty [3] AFID, + sMS [4] SMSTPDUData OPTIONAL, + sourcePort [5] PortNumber OPTIONAL, + destinationPort [6] PortNumber OPTIONAL +} + +-- See clause 7.7.5.1.1 for details of this structure +NEFExpectedUEBehaviourUpdate ::= SEQUENCE +{ + gPSI [1] GPSI, + expectedUEMovingTrajectory [2] SEQUENCE OF UMTLocationArea5G OPTIONAL, + stationaryIndication [3] StationaryIndication OPTIONAL, + communicationDurationTime [4] INTEGER OPTIONAL, + periodicTime [5] INTEGER OPTIONAL, + scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, + scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, + batteryIndication [8] BatteryIndication OPTIONAL, + trafficProfile [9] TrafficProfile OPTIONAL, + expectedTimeAndDayOfWeekInTrajectory [10] SEQUENCE OF UMTLocationArea5G OPTIONAL, + aFID [11] AFID, + validityTime [12] Timestamp OPTIONAL +} + +-- ========================== +-- Common SCEF/NEF parameters +-- ========================== + +RDSSupport ::= BOOLEAN + +RDSPortNumber ::= INTEGER (0..15) + +RDSAction ::= ENUMERATED +{ + reservePort(1), + releasePort(2) +} + +SerializationFormat ::= ENUMERATED +{ + xml(1), + json(2), + cbor(3) +} + +ApplicationID ::= OCTET STRING + +NIDDCCPDU ::= OCTET STRING + +TriggerID ::= UTF8String + +PriorityDT ::= ENUMERATED +{ + noPriority(1), + priority(2) +} + +TriggerPayload ::= OCTET STRING + +DeviceTriggerDeliveryResult ::= ENUMERATED +{ + success(1), + unknown(2), + failure(3), + triggered(4), + expired(5), + unconfirmed(6), + replaced(7), + terminate(8) +} + +StationaryIndication ::= ENUMERATED +{ + stationary(1), + mobile(2) +} + +BatteryIndication ::= ENUMERATED +{ + batteryRecharge(1), + batteryReplace(2), + batteryNoRecharge(3), + batteryNoReplace(4), + noBattery(5) +} + +ScheduledCommunicationTime ::= SEQUENCE +{ + days [1] SEQUENCE OF Daytime +} + +UMTLocationArea5G ::= SEQUENCE +{ + timeOfDay [1] Daytime, + durationSec [2] INTEGER, + location [3] NRLocation +} + +Daytime ::= SEQUENCE +{ + daysOfWeek [1] Day OPTIONAL, + timeOfDayStart [2] Timestamp OPTIONAL, + timeOfDayEnd [3] Timestamp OPTIONAL +} + +Day ::= ENUMERATED +{ + monday(1), + tuesday(2), + wednesday(3), + thursday(4), + friday(5), + saturday(6), + sunday(7) +} + +TrafficProfile ::= ENUMERATED +{ + singleTransUL(1), + singleTransDL(2), + dualTransULFirst(3), + dualTransDLFirst(4), + multiTrans(5) } +ScheduledCommunicationType ::= ENUMERATED +{ + downlinkOnly(1), + uplinkOnly(2), + bidirectional(3) +} + +-- ================= +-- 5G NEF parameters +-- ================= + +NEFFailureCause ::= ENUMERATED +{ + userUnknown(1), + niddConfigurationNotAvailable(2), + contextNotFound(3), + portNotFree(4), + portNotAssociatedWithSpecifiedApplication(5) +} + +NEFReleaseCause ::= ENUMERATED +{ + sMFRelease(1), + dNRelease(2), + uDMRelease(3), + cHFRelease(4), + localConfigurationPolicy(5), + unknownCause(6) +} + +AFID ::= UTF8String + +NEFID ::= UTF8String + +-- ================== +-- SCEF definitions +-- ================== + +-- See clause 7.8.2.1.2 for details of this structure +SCEFPDNConnectionEstablishment ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + ePSBearerID [5] EPSBearerID, + sCEFID [6] SCEFID, + aPN [7] APN, + rDSSupport [8] RDSSupport, + sCSASID [9] SCSASID +} + +-- See clause 7.8.2.1.3 for details of this structure +SCEFPDNConnectionUpdate ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + initiator [4] Initiator, + rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, + rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, + applicationID [7] ApplicationID OPTIONAL, + sCSASID [8] SCSASID OPTIONAL, + rDSAction [9] RDSAction OPTIONAL, + serializationFormat [10] SerializationFormat OPTIONAL +} + +-- See clause 7.8.2.1.4 for details of this structure +SCEFPDNConnectionRelease ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + ePSBearerID [4] EPSBearerID, + timeOfFirstPacket [5] Timestamp OPTIONAL, + timeOfLastPacket [6] Timestamp OPTIONAL, + uplinkVolume [7] INTEGER OPTIONAL, + downlinkVolume [8] INTEGER OPTIONAL, + releaseCause [9] SCEFReleaseCause +} + +-- See clause 7.8.2.1.5 for details of this structure +SCEFUnsuccessfulProcedure ::= SEQUENCE +{ + failureCause [1] SCEFFailureCause, + iMSI [2] IMSI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + externalIdentifier [4] NAI OPTIONAL, + ePSBearerID [5] EPSBearerID, + aPN [6] APN, + rDSDestinationPortNumber [7] RDSPortNumber OPTIONAL, + applicationID [8] ApplicationID OPTIONAL, + sCSASID [9] SCSASID +} + +-- See clause 7.8.2.1.6 for details of this structure +SCEFStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + ePSBearerID [5] EPSBearerID, + sCEFID [6] SCEFID, + aPN [7] APN, + rDSSupport [8] RDSSupport, + sCSASID [9] SCSASID +} + +-- See clause 7.8.3.1.1 for details of this structure +SCEFDeviceTrigger ::= SEQUENCE +{ + iMSI [1] IMSI, + mSISDN [2] MSISDN, + externalIdentifier [3] NAI, + triggerId [4] TriggerID, + sCSASID [5] SCSASID OPTIONAL, + triggerPayload [6] TriggerPayload OPTIONAL, + validityPeriod [7] INTEGER OPTIONAL, + priorityDT [8] PriorityDT OPTIONAL, + sourcePortId [9] PortNumber OPTIONAL, + destinationPortId [10] PortNumber OPTIONAL +} + +-- See clause 7.8.3.1.2 for details of this structure +SCEFDeviceTriggerReplace ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID, + sCSASID [5] SCSASID OPTIONAL, + triggerPayload [6] TriggerPayload OPTIONAL, + validityPeriod [7] INTEGER OPTIONAL, + priorityDT [8] PriorityDT OPTIONAL, + sourcePortId [9] PortNumber OPTIONAL, + destinationPortId [10] PortNumber OPTIONAL +} + +-- See clause 7.8.3.1.3 for details of this structure +SCEFDeviceTriggerCancellation ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID +} + +-- See clause 7.8.3.1.4 for details of this structure +SCEFDeviceTriggerReportNotify ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifier [3] NAI OPTIONAL, + triggerId [4] TriggerID, + deviceTriggerDeliveryResult [5] DeviceTriggerDeliveryResult +} + +-- See clause 7.8.4.1.1 for details of this structure +SCEFMSISDNLessMOSMS ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + externalIdentifie [3] NAI OPTIONAL, + terminatingSMSParty [4] SCSASID, + sMS [5] SMSTPDUData OPTIONAL, + sourcePort [6] PortNumber OPTIONAL, + destinationPort [7] PortNumber OPTIONAL +} + +-- See clause 7.8.5.1.1 for details of this structure +SCEFCommunicationPatternUpdate ::= SEQUENCE +{ + mSISDN [1] MSISDN OPTIONAL, + externalIdentifier [2] NAI OPTIONAL, + periodicCommunicationIndicator [3] PeriodicCommunicationIndicator OPTIONAL, + communicationDurationTime [4] INTEGER OPTIONAL, + periodicTime [5] INTEGER OPTIONAL, + scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, + scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, + stationaryIndication [8] StationaryIndication OPTIONAL, + batteryIndication [9] BatteryIndication OPTIONAL, + trafficProfile [10] TrafficProfile OPTIONAL, + expectedUEMovingTrajectory [11] SEQUENCE OF UMTLocationArea5G OPTIONAL, + sCSASID [13] SCSASID, + validityTime [14] Timestamp OPTIONAL +} + +-- ================= +-- SCEF parameters +-- ================= + +SCEFFailureCause ::= ENUMERATED +{ + userUnknown(1), + niddConfigurationNotAvailable(2), + invalidEPSBearer(3), + operationNotAllowed(4), + portNotFree(5), + portNotAssociatedWithSpecifiedApplication(6) +} + +SCEFReleaseCause ::= ENUMERATED +{ + mMERelease(1), + dNRelease(2), + hSSRelease(3), + localConfigurationPolicy(4), + unknownCause(5) +} + +SCSASID ::= UTF8String + +SCEFID ::= UTF8String + +PeriodicCommunicationIndicator ::= ENUMERATED +{ + periodic(1), + nonPeriodic(2) +} + +EPSBearerID ::= INTEGER (0..255) + +APN ::= UTF8String + + -- ================== -- 5G AMF definitions -- ================== @@ -290,7 +832,10 @@ AMFRegistration ::= SEQUENCE gUTI [8] FiveGGUTI, location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - fiveGSTAIList [11] TAIList OPTIONAL + fiveGSTAIList [11] TAIList OPTIONAL, + sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL, + oldGUTI [13] EPS5GGUTI OPTIONAL, + eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -304,7 +849,9 @@ AMFDeregistration ::= SEQUENCE gPSI [6] GPSI OPTIONAL, gUTI [7] FiveGGUTI OPTIONAL, cause [8] FiveGMMCause OPTIONAL, - location [9] Location OPTIONAL + location [9] Location OPTIONAL, + switchOffIndicator [10] SwitchOffIndicator OPTIONAL, + reRegRequiredIndicator [11] ReRegRequiredIndicator OPTIONAL } -- See clause 6.2.2.2.4 for details of this structure @@ -315,7 +862,9 @@ AMFLocationUpdate ::= SEQUENCE pEI [3] PEI OPTIONAL, gPSI [4] GPSI OPTIONAL, gUTI [5] FiveGGUTI OPTIONAL, - location [6] Location + location [6] Location, + sMSOverNASIndicator [7] SMSOverNASIndicator OPTIONAL, + oldGUTI [8] EPS5GGUTI OPTIONAL } -- See clause 6.2.2.2.5 for details of this structure @@ -332,7 +881,10 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, timeOfRegistration [11] Timestamp OPTIONAL, - fiveGSTAIList [12] TAIList OPTIONAL + fiveGSTAIList [12] TAIList OPTIONAL, + sMSOverNASIndicator [13] SMSOverNASIndicator OPTIONAL, + oldGUTI [14] EPS5GGUTI OPTIONAL, + eMM5GRegStatus [15] EMM5GMMStatus OPTIONAL } -- See clause 6.2.2.2.6 for details of this structure @@ -640,6 +1192,8 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE -- 5G SMF parameters -- ================= +SMFID ::= UTF8String + SMFFailedProcedureType ::= ENUMERATED { pDUSessionEstablishment(1), @@ -682,10 +1236,10 @@ SMFMAAcceptedIndication ::= BOOLEAN -- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure. SMFErrorCodes ::= UTF8String --- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. +-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. UEEPSPDNConnection ::= OCTET STRING --- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. +-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. RequestIndication ::= ENUMERATED { uEREQPDUSESMOD(0), @@ -728,7 +1282,7 @@ QFI ::= INTEGER (0..63) -- 5G UDM definitions -- ================== -UDMServingSystemMessage ::= SEQUENCE +UDMServingSystemMessage ::= SEQUENCE { sUPI [1] SUPI, pEI [2] PEI OPTIONAL, @@ -954,7 +1508,7 @@ MMSSendByNonLocalTarget ::= SEQUENCE dRMContent [23] BOOLEAN OPTIONAL, adaptationAllowed [24] MMSAdaptation OPTIONAL } - + MMSNotification ::= SEQUENCE { transactionID [1] UTF8String, @@ -970,7 +1524,7 @@ MMSNotification ::= SEQUENCE expiry [11] MMSExpiry, replyCharging [12] MMSReplyCharging OPTIONAL } - + MMSSendToNonLocalTarget ::= SEQUENCE { version [1] MMSVersion, @@ -1024,7 +1578,7 @@ MMSRetrieval ::= SEQUENCE state [12] MMState OPTIONAL, flags [13] MMFlags OPTIONAL, messageClass [14] MMSMessageClass OPTIONAL, - priority [15] MMSPriority, + priority [15] MMSPriority, deliveryReport [16] BOOLEAN OPTIONAL, readReport [17] BOOLEAN OPTIONAL, replyCharging [18] MMSReplyCharging OPTIONAL, @@ -1058,7 +1612,7 @@ MMSForward ::= SEQUENCE cCRecipients [6] SEQUENCE OF MMSParty OPTIONAL, bCCRecipients [7] SEQUENCE OF MMSParty OPTIONAL, direction [8] MMSDirection, - expiry [9] MMSExpiry OPTIONAL, + expiry [9] MMSExpiry OPTIONAL, desiredDeliveryTime [10] Timestamp OPTIONAL, deliveryReportAllowed [11] BOOLEAN OPTIONAL, deliveryReport [12] BOOLEAN OPTIONAL, @@ -1070,10 +1624,10 @@ MMSForward ::= SEQUENCE responseStatus [18] MMSResponseStatus, responseStatusText [19] UTF8String OPTIONAL, messageID [20] UTF8String OPTIONAL, - contentLocationConf [21] UTF8String OPTIONAL, + contentLocationConf [21] UTF8String OPTIONAL, storeStatus [22] MMSStoreStatus OPTIONAL, storeStatusText [23] UTF8String OPTIONAL -} +} MMSDeleteFromRelay ::= SEQUENCE { @@ -1091,13 +1645,13 @@ MMSMBoxStore ::= SEQUENCE transactionID [1] UTF8String, version [2] MMSVersion, direction [3] MMSDirection, - contentLocationReq [4] UTF8String, + contentLocationReq [4] UTF8String, state [5] MMState OPTIONAL, flags [6] MMFlags OPTIONAL, - contentLocationConf [7] UTF8String OPTIONAL, + contentLocationConf [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL -} +} MMSMBoxUpload ::= SEQUENCE { @@ -1107,11 +1661,11 @@ MMSMBoxUpload ::= SEQUENCE state [4] MMState OPTIONAL, flags [5] MMFlags OPTIONAL, contentType [6] UTF8String, - contentLocation [7] UTF8String OPTIONAL, + contentLocation [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL, mMessages [10] SEQUENCE OF MMBoxDescription -} +} MMSMBoxDelete ::= SEQUENCE { @@ -1191,7 +1745,7 @@ MMSCancel ::= SEQUENCE version [2] MMSVersion, cancelID [3] UTF8String, direction [4] MMSDirection -} +} MMSMBoxViewRequest ::= SEQUENCE { @@ -1248,7 +1802,7 @@ MMBoxDescription ::= SEQUENCE -- ========= -- MMS CCPDU -- ========= - + MMSCCPDU ::= SEQUENCE { version [1] MMSVersion, @@ -1314,7 +1868,7 @@ MMSDeleteResponseStatus ::= ENUMERATED errorPermanentReplyChargingNotSupported(24), errorPermanentAddressHidingNotSupported(25), errorPermanentLackOfPrepaid(26) -} +} MMSDirection ::= ENUMERATED { @@ -1329,13 +1883,13 @@ MMSElementDescriptor ::= SEQUENCE value [3] UTF8String OPTIONAL } -MMSExpiry ::= SEQUENCE +MMSExpiry ::= SEQUENCE { expiryPeriod [1] INTEGER, - periodFormat [2] MMSPeriodFormat + periodFormat [2] MMSPeriodFormat } -MMFlags ::= SEQUENCE +MMFlags ::= SEQUENCE { length [1] INTEGER, flag [2] MMStateFlag, @@ -1365,7 +1919,7 @@ MMSPartyID ::= CHOICE iMPI [5] IMPI, sUPI [6] SUPI, gPSI [7] GPSI -} +} MMSPeriodFormat ::= ENUMERATED { @@ -1513,7 +2067,7 @@ MMSVersion ::= SEQUENCE { majorVersion [1] INTEGER, minorVersion [2] INTEGER -} +} -- ================== -- 5G PTC definitions @@ -1706,11 +2260,12 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } --- ================= --- PTC CCPDU --- ================= -PTCCCPDU ::= OCTET STRING +-- ========= +-- PTC CCPDU +-- ========= + +PTCCCPDU ::= OCTET STRING -- ================= @@ -1756,7 +2311,7 @@ PTCIdentifiers ::= CHOICE PTCSessionInfo ::= SEQUENCE { - pTCSessionURI [1] UTF8String, + pTCSessionURI [1] UTF8String, pTCSessionType [2] PTCSessionType } @@ -1905,7 +2460,7 @@ PTCAccessPolicyFailure ::= ENUMERATED { requestUnsuccessful(1), requestUnknown(2) -} +} -- =================== -- 5G LALS definitions @@ -1914,7 +2469,7 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, - -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number +-- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, location [4] Location OPTIONAL, iMPU [5] IMPU OPTIONAL, @@ -1928,7 +2483,7 @@ LALSReport ::= SEQUENCE PDHeaderReport ::= SEQUENCE { - pDUSessionID [1] PDUSessionID, + pDUSessionID [1] PDUSessionID, sourceIPAddress [2] IPAddress, sourcePort [3] PortNumber OPTIONAL, destinationIPAddress [4] IPAddress, @@ -1998,14 +2553,6 @@ MMEIdentifierAssocation ::= SEQUENCE -- Identifier Association parameters -- ================================= -GUTI ::= SEQUENCE -{ - mCC [1] MCC, - mNC [2] MNC, - mMEGroupID [3] MMEGroupID, - mMECode [4] MMECode, - mTMSI [5] TMSI -} MMEGroupID ::= OCTET STRING (SIZE(2)) @@ -2013,6 +2560,144 @@ MMECode ::= OCTET STRING (SIZE(1)) TMSI ::= OCTET STRING (SIZE(4)) +-- =================== +-- EPS MME definitions +-- =================== + +MMEAttach ::= SEQUENCE +{ + attachType [1] EPSAttachType, + attachResult [2] EPSAttachResult, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL, + ePSTAIList [8] TAIList OPTIONAL, + sMSServiceStatus [9] EPSSMSServiceStatus OPTIONAL, + oldGUTI [10] GUTI OPTIONAL, + eMM5GRegStatus [11] EMM5GMMStatus OPTIONAL +} + +MMEDetach ::= SEQUENCE +{ + detachDirection [1] MMEDirection, + detachType [2] EPSDetachType, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + cause [7] EMMCause OPTIONAL, + location [8] Location OPTIONAL, + switchOffIndicator [9] SwitchOffIndicator OPTIONAL +} + +MMELocationUpdate ::= SEQUENCE +{ + iMSI [1] IMSI, + iMEI [2] IMEI OPTIONAL, + mSISDN [3] MSISDN OPTIONAL, + gUTI [4] GUTI OPTIONAL, + location [5] Location OPTIONAL, + oldGUTI [6] GUTI OPTIONAL, + sMSServiceStatus [7] EPSSMSServiceStatus OPTIONAL +} + +MMEStartOfInterceptionWithEPSAttachedUE ::= SEQUENCE +{ + attachType [1] EPSAttachType, + attachResult [2] EPSAttachResult, + iMSI [3] IMSI, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL, + ePSTAIList [9] TAIList OPTIONAL, + sMSServiceStatus [10] EPSSMSServiceStatus OPTIONAL, + eMM5GRegStatus [12] EMM5GMMStatus OPTIONAL +} + +MMEUnsuccessfulProcedure ::= SEQUENCE +{ + failedProcedureType [1] MMEFailedProcedureType, + failureCause [2] MMEFailureCause, + iMSI [3] IMSI OPTIONAL, + iMEI [4] IMEI OPTIONAL, + mSISDN [5] MSISDN OPTIONAL, + gUTI [6] GUTI OPTIONAL, + location [7] Location OPTIONAL +} + +-- ================== +-- EPS MME parameters +-- ================== + +EMMCause ::= INTEGER (0..255) + +ESMCause ::= INTEGER (0..255) + +EPSAttachType ::= ENUMERATED +{ + ePSAttach(1), + combinedEPSIMSIAttach(2), + ePSRLOSAttach(3), + ePSEmergencyAttach(4), + reserved(5) +} + +EPSAttachResult ::= ENUMERATED +{ + ePSOnly(1), + combinedEPSIMSI(2) +} + + +EPSDetachType ::= ENUMERATED +{ + ePSDetach(1), + iMSIDetach(2), + combinedEPSIMSIDetach(3), + reAttachRequired(4), + reAttachNotRequired(5), + reserved(6) +} + +EPSSMSServiceStatus ::= ENUMERATED +{ + sMSServicesNotAvailable(1), + sMSServicesNotAvailableInThisPLMN(2), + networkFailure(3), + congestion(4) +} + +MMEDirection ::= ENUMERATED +{ + networkInitiated(1), + uEInitiated(2) +} + +MMEFailedProcedureType ::= ENUMERATED +{ + attachReject(1), + authenticationReject(2), + securityModeReject(3), + serviceReject(4), + trackingAreaUpdateReject(5), + activateDedicatedEPSBearerContextReject(6), + activateDefaultEPSBearerContextReject(7), + bearerResourceAllocationReject(8), + bearerResourceModificationReject(9), + modifyEPSBearerContectReject(10), + pDNConnectivityReject(11), + pDNDisconnectReject(12) +} + +MMEFailureCause ::= CHOICE +{ + eMMCause [1] EMMCause, + eSMCause [2] ESMCause +} + -- =========================== -- LI Notification definitions -- =========================== @@ -2050,6 +2735,35 @@ LIAppliedDeliveryInformation ::= SEQUENCE -- =============== MDFCellSiteReport ::= SEQUENCE OF CellInformation +-- ============================== +-- 5G EPS Interworking Parameters +-- ============================== + + +EMM5GMMStatus ::= SEQUENCE +{ + eMMRegStatus [1] EMMRegStatus OPTIONAL, + fiveGMMStatus [2] FiveGMMStatus OPTIONAL +} + + +EPS5GGUTI ::= CHOICE +{ + gUTI [1] GUTI, + fiveGGUTI [2] FiveGGUTI +} + +EMMRegStatus ::= ENUMERATED +{ + uEEMMRegistered(1), + uENotEMMRegistered(2) +} + +FiveGMMStatus ::= ENUMERATED +{ + uE5GMMRegistered(1), + uENot5GMMRegistered(2) +} -- ================= -- Common Parameters @@ -2127,6 +2841,15 @@ GUMMEI ::= SEQUENCE mNC [3] MNC } +GUTI ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + mMEGroupID [3] MMEGroupID, + mMECode [4] MMECode, + mTMSI [5] TMSI +} + HomeNetworkPublicKeyID ::= OCTET STRING HSMFURI ::= UTF8String @@ -2250,6 +2973,12 @@ RejectedSNSSAI ::= SEQUENCE RejectedSliceCauseValue ::= INTEGER (0..255) +ReRegRequiredIndicator ::= ENUMERATED +{ + reRegistrationRequired(1), + reRegistrationNotRequired(2) +} + RoutingIndicator ::= INTEGER (0..9999) SchemeOutput ::= OCTET STRING @@ -2265,6 +2994,13 @@ Slice ::= SEQUENCE SMPDUDNRequest ::= OCTET STRING +-- TS 24.501 [13], clause 9.11.3.6.1 +SMSOverNASIndicator ::= ENUMERATED +{ + sMSOverNASNotAllowed(1), + sMSOverNASAllowed(2) +} + SNSSAI ::= SEQUENCE { sliceServiceType [1] INTEGER (0..255), @@ -2289,6 +3025,12 @@ SUPI ::= CHOICE SUPIUnauthenticatedIndication ::= BOOLEAN +SwitchOffIndicator ::= ENUMERATED +{ + normalDetach(1), + switchOff(2) +} + TargetIdentifier ::= CHOICE { sUPI [1] SUPI, @@ -2328,9 +3070,10 @@ UEEndpointAddress ::= CHOICE Location ::= SEQUENCE { - locationInfo [1] LocationInfo OPTIONAL, - positioningInfo [2] PositioningInfo OPTIONAL, - locationPresenceReport [3] LocationPresenceReport OPTIONAL + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL, + ePSLocationInfo [4] EPSLocationInfo OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -2344,7 +3087,7 @@ CellSiteInformation ::= SEQUENCE LocationInfo ::= SEQUENCE { userLocation [1] UserLocation OPTIONAL, - currentLoc [2] BOOLEAN OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, geoInfo [3] GeographicArea OPTIONAL, rATType [4] RATType OPTIONAL, timeZone [5] TimeZone OPTIONAL, @@ -2364,10 +3107,10 @@ EUTRALocation ::= SEQUENCE { tAI [1] TAI, eCGI [2] ECGI, - ageOfLocatonInfo [3] INTEGER OPTIONAL, + ageOfLocationInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, - geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalNGENbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL, globalENbID [9] GlobalRANNodeID OPTIONAL @@ -2378,10 +3121,10 @@ NRLocation ::= SEQUENCE { tAI [1] TAI, nCGI [2] NCGI, - ageOfLocatonInfo [3] INTEGER OPTIONAL, + ageOfLocationInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalGNbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -2390,7 +3133,7 @@ NRLocation ::= SEQUENCE N3GALocation ::= SEQUENCE { tAI [1] TAI OPTIONAL, - n3IWFID [2] N3IWFIDNGAP OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, uEIPAddr [3] IPAddr OPTIONAL, portNumber [4] INTEGER OPTIONAL, tNAPID [5] TNAPID OPTIONAL, @@ -2437,12 +3180,37 @@ TAI ::= SEQUENCE nID [3] NID OPTIONAL } +CGI ::= SEQUENCE +{ + lAI [1] LAI, + cellID [2] CellID +} + +LAI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + lAC [2] LAC +} + +LAC ::= OCTET STRING (SIZE(2)) + +CellID ::= OCTET STRING (SIZE(2)) + +SAI ::= SEQUENCE +{ + pLMNID [1] PLMNID, + lAC [2] LAC, + sAC [3] SAC +} + +SAC ::= OCTET STRING (SIZE(2)) + -- TS 29.571 [17], clause 5.4.4.5 ECGI ::= SEQUENCE { pLMNID [1] PLMNID, eUTRACellID [2] EUTRACellID, - nID [3] NID OPTIONAL + nID [3] NID OPTIONAL } TAIList ::= SEQUENCE OF TAI @@ -2461,7 +3229,7 @@ RANCGI ::= CHOICE nCGI [2] NCGI } -CellInformation ::= SEQUENCE +CellInformation ::= SEQUENCE { rANCGI [1] RANCGI, cellSiteinformation [2] CellSiteInformation OPTIONAL, @@ -2552,12 +3320,12 @@ ENbID ::= CHOICE PositioningInfo ::= SEQUENCE { positionInfo [1] LocationData OPTIONAL, - rawMLPResponse [2] RawMLPResponse OPTIONAL + rawMLPResponse [2] RawMLPResponse OPTIONAL } RawMLPResponse ::= CHOICE { - -- The following parameter contains a copy of unparsed XML code of the + -- The following parameter contains a copy of unparsed XML code of the -- MLP response message, i.e. the entire XML document containing -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. @@ -2582,6 +3350,25 @@ LocationData ::= SEQUENCE barometricPressure [11] BarometricPressure OPTIONAL } +-- TS 29.172 [53], table 6.2.2-2 +EPSLocationInfo ::= SEQUENCE +{ + locationData [1] LocationData, + cGI [2] CGI OPTIONAL, + sAI [3] SAI OPTIONAL, + eSMLCCellInfo [4] ESMLCCellInfo OPTIONAL +} + +-- TS 29.172 [53], clause 7.4.57 +ESMLCCellInfo ::= SEQUENCE +{ + eCGI [1] ECGI, + cellPortionID [2] CellPortionID +} + +-- TS 29.171 [54], clause 7.4.31 +CellPortionID ::= INTEGER (0..4095) + -- TS 29.518 [22], clause 6.2.6.2.5 LocationPresenceReport ::= SEQUENCE { @@ -2857,7 +3644,7 @@ HorizontalVelocityWithUncertainty ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.21 HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE { - hspeed [1] HorizontalSpeed, + hSpeed [1] HorizontalSpeed, bearing [2] Angle, vSpeed [3] VerticalSpeed, vDirection [4] VerticalDirection, @@ -2865,7 +3652,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE vUncertainty [6] SpeedUncertainty } --- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) -- GitLab From 60d052bf67922b67dca2687ab5a7d042b5cdd800 Mon Sep 17 00:00:00 2001 From: canterburym Date: Mon, 13 Sep 2021 14:10:54 +0200 Subject: [PATCH 31/41] Reverting change from s3i210494 (wrong baseline, changes made to R17 ASN.1) --- 33128/r16/TS33128Payloads.asn | 923 +++------------------------------- 1 file changed, 68 insertions(+), 855 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 22c85fc..6a2759b 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) r17(17) version0(0)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version6(6)} 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) r16(16) version6(6)} xIRIPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)} xCCPayloadOID RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)} @@ -117,43 +117,8 @@ XIRIEvent ::= CHOICE aMFIdentifierAssocation [62] AMFIdentifierAssocation, mMEIdentifierAssocation [63] MMEIdentifierAssocation, - -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 - sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - - -- NEF services related events, see clause 7.7.2 - nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, - nEFPDUSessionModification [66] NEFPDUSessionModification, - nEFPDUSessionRelease [67] NEFPDUSessionRelease, - nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, - nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, - nEFdeviceTrigger [70] NEFDeviceTrigger, - nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, - nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, - nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, - nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, - nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, - - -- SCEF services related events, see clause 7.8.2 - sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, - sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, - sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, - sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, - sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, - sCEFdeviceTrigger [81] SCEFDeviceTrigger, - sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, - sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, - sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, - sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, - sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - - --EPS Events, see clause 6.3 - - --MME Events, see clause 6.3.2.2 - mMEAttach [87] MMEAttach, - mMEDetach [88] MMEDetach, - mMELocationUpdate [89] MMELocationUpdate, - mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } -- ============== @@ -265,42 +230,7 @@ IRIEvent ::= CHOICE mMEIdentifierAssocation [63] MMEIdentifierAssocation, -- PDU to MA PDU session-related events, see clause 6.2.3.2.8 - sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification, - - -- NEF services related events, see clause 7.7.2, - nEFPDUSessionEstablishment [65] NEFPDUSessionEstablishment, - nEFPDUSessionModification [66] NEFPDUSessionModification, - nEFPDUSessionRelease [67] NEFPDUSessionRelease, - nEFUnsuccessfulProcedure [68] NEFUnsuccessfulProcedure, - nEFStartOfInterceptionWithEstablishedPDUSession [69] NEFStartOfInterceptionWithEstablishedPDUSession, - nEFdeviceTrigger [70] NEFDeviceTrigger, - nEFdeviceTriggerReplace [71] NEFDeviceTriggerReplace, - nEFdeviceTriggerCancellation [72] NEFDeviceTriggerCancellation, - nEFdeviceTriggerReportNotify [73] NEFDeviceTriggerReportNotify, - nEFMSISDNLessMOSMS [74] NEFMSISDNLessMOSMS, - nEFExpectedUEBehaviourUpdate [75] NEFExpectedUEBehaviourUpdate, - - -- SCEF services related events, see clause 7.8.2 - sCEFPDNConnectionEstablishment [76] SCEFPDNConnectionEstablishment, - sCEFPDNConnectionUpdate [77] SCEFPDNConnectionUpdate, - sCEFPDNConnectionRelease [78] SCEFPDNConnectionRelease, - sCEFUnsuccessfulProcedure [79] SCEFUnsuccessfulProcedure, - sCEFStartOfInterceptionWithEstablishedPDNConnection [80] SCEFStartOfInterceptionWithEstablishedPDNConnection, - sCEFdeviceTrigger [81] SCEFDeviceTrigger, - sCEFdeviceTriggerReplace [82] SCEFDeviceTriggerReplace, - sCEFdeviceTriggerCancellation [83] SCEFDeviceTriggerCancellation, - sCEFdeviceTriggerReportNotify [84] SCEFDeviceTriggerReportNotify, - sCEFMSISDNLessMOSMS [85] SCEFMSISDNLessMOSMS, - sCEFCommunicationPatternUpdate [86] SCEFCommunicationPatternUpdate, - - --EPS Events, see clause 6.3 - - --MME Events, see clause 6.3.2.2 - mMEAttach [87] MMEAttach, - mMEDetach [88] MMEDetach, - mMELocationUpdate [89] MMELocationUpdate, - mMEStartOfInterceptionWithEPSAttachedUE [90] MMEStartOfInterceptionWithEPSAttachedUE, - mMEUnsuccessfulProcedure [91] MMEUnsuccessfulProcedure + sMFPDUtoMAPDUSessionModification [64] SMFPDUtoMAPDUSessionModification } IRITargetIdentifier ::= SEQUENCE @@ -315,8 +245,8 @@ IRITargetIdentifier ::= SEQUENCE CCPayload ::= SEQUENCE { - cCPayloadOID [1] RELATIVE-OID, - pDU [2] CCPDU + cCPayloadOID [1] RELATIVE-OID, + pDU [2] CCPDU } CCPDU ::= CHOICE @@ -324,7 +254,8 @@ CCPDU ::= CHOICE uPFCCPDU [1] UPFCCPDU, extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, - pTCCCPDU [5] PTCCCPDU + pTCCCPDU [4] PTCCCPDU + } -- =========================== @@ -339,482 +270,9 @@ LINotificationPayload ::= SEQUENCE LINotificationMessage ::= CHOICE { - lINotification [1] LINotification -} --- ================== --- 5G NEF definitions --- ================== - --- See clause 7.7.2.1.2 for details of this structure -NEFPDUSessionEstablishment ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - pDUSessionID [3] PDUSessionID, - sNSSAI [4] SNSSAI, - nEFID [5] NEFID, - dNN [6] DNN, - rDSSupport [7] RDSSupport, - sMFID [8] SMFID, - aFID [9] AFID -} - --- See clause 7.7.2.1.3 for details of this structure -NEFPDUSessionModification ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - sNSSAI [3] SNSSAI, - initiator [4] Initiator, - rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, - rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, - applicationID [7] ApplicationID OPTIONAL, - aFID [8] AFID OPTIONAL, - rDSAction [9] RDSAction OPTIONAL, - serializationFormat [10] SerializationFormat OPTIONAL -} - --- See clause 7.7.2.1.4 for details of this structure -NEFPDUSessionRelease ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - pDUSessionID [3] PDUSessionID, - timeOfFirstPacket [4] Timestamp OPTIONAL, - timeOfLastPacket [5] Timestamp OPTIONAL, - uplinkVolume [6] INTEGER OPTIONAL, - downlinkVolume [7] INTEGER OPTIONAL, - releaseCause [8] NEFReleaseCause -} - --- See clause 7.7.2.1.5 for details of this structure -NEFUnsuccessfulProcedure ::= SEQUENCE -{ - failureCause [1] NEFFailureCause, - sUPI [2] SUPI, - gPSI [3] GPSI OPTIONAL, - pDUSessionID [4] PDUSessionID, - dNN [5] DNN OPTIONAL, - sNSSAI [6] SNSSAI OPTIONAL, - rDSDestinationPortNumber [7] RDSPortNumber, - applicationID [8] ApplicationID, - aFID [9] AFID -} - --- See clause 7.7.2.1.6 for details of this structure -NEFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - pDUSessionID [3] PDUSessionID, - dNN [4] DNN, - sNSSAI [5] SNSSAI, - nEFID [6] NEFID, - rDSSupport [7] RDSSupport, - sMFID [8] SMFID, - aFID [9] AFID -} - --- See clause 7.7.3.1.1 for details of this structure -NEFDeviceTrigger ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - triggerId [3] TriggerID, - aFID [4] AFID, - triggerPayload [5] TriggerPayload OPTIONAL, - validityPeriod [6] INTEGER OPTIONAL, - priorityDT [7] PriorityDT OPTIONAL, - sourcePortId [8] PortNumber OPTIONAL, - destinationPortId [9] PortNumber OPTIONAL -} - --- See clause 7.7.3.1.2 for details of this structure -NEFDeviceTriggerReplace ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - triggerId [3] TriggerID, - aFID [4] AFID, - triggerPayload [5] TriggerPayload OPTIONAL, - validityPeriod [6] INTEGER OPTIONAL, - priorityDT [7] PriorityDT OPTIONAL, - sourcePortId [8] PortNumber OPTIONAL, - destinationPortId [9] PortNumber OPTIONAL -} - --- See clause 7.7.3.1.3 for details of this structure -NEFDeviceTriggerCancellation ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - triggerId [3] TriggerID -} - --- See clause 7.7.3.1.4 for details of this structure -NEFDeviceTriggerReportNotify ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - triggerId [3] TriggerID, - deviceTriggerDeliveryResult [4] DeviceTriggerDeliveryResult -} - --- See clause 7.7.4.1.1 for details of this structure -NEFMSISDNLessMOSMS ::= SEQUENCE -{ - sUPI [1] SUPI, - gPSI [2] GPSI, - terminatingSMSParty [3] AFID, - sMS [4] SMSTPDUData OPTIONAL, - sourcePort [5] PortNumber OPTIONAL, - destinationPort [6] PortNumber OPTIONAL -} - --- See clause 7.7.5.1.1 for details of this structure -NEFExpectedUEBehaviourUpdate ::= SEQUENCE -{ - gPSI [1] GPSI, - expectedUEMovingTrajectory [2] SEQUENCE OF UMTLocationArea5G OPTIONAL, - stationaryIndication [3] StationaryIndication OPTIONAL, - communicationDurationTime [4] INTEGER OPTIONAL, - periodicTime [5] INTEGER OPTIONAL, - scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, - scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, - batteryIndication [8] BatteryIndication OPTIONAL, - trafficProfile [9] TrafficProfile OPTIONAL, - expectedTimeAndDayOfWeekInTrajectory [10] SEQUENCE OF UMTLocationArea5G OPTIONAL, - aFID [11] AFID, - validityTime [12] Timestamp OPTIONAL -} - --- ========================== --- Common SCEF/NEF parameters --- ========================== - -RDSSupport ::= BOOLEAN - -RDSPortNumber ::= INTEGER (0..15) - -RDSAction ::= ENUMERATED -{ - reservePort(1), - releasePort(2) -} - -SerializationFormat ::= ENUMERATED -{ - xml(1), - json(2), - cbor(3) -} - -ApplicationID ::= OCTET STRING - -NIDDCCPDU ::= OCTET STRING - -TriggerID ::= UTF8String - -PriorityDT ::= ENUMERATED -{ - noPriority(1), - priority(2) -} - -TriggerPayload ::= OCTET STRING - -DeviceTriggerDeliveryResult ::= ENUMERATED -{ - success(1), - unknown(2), - failure(3), - triggered(4), - expired(5), - unconfirmed(6), - replaced(7), - terminate(8) -} - -StationaryIndication ::= ENUMERATED -{ - stationary(1), - mobile(2) -} - -BatteryIndication ::= ENUMERATED -{ - batteryRecharge(1), - batteryReplace(2), - batteryNoRecharge(3), - batteryNoReplace(4), - noBattery(5) -} - -ScheduledCommunicationTime ::= SEQUENCE -{ - days [1] SEQUENCE OF Daytime -} - -UMTLocationArea5G ::= SEQUENCE -{ - timeOfDay [1] Daytime, - durationSec [2] INTEGER, - location [3] NRLocation -} - -Daytime ::= SEQUENCE -{ - daysOfWeek [1] Day OPTIONAL, - timeOfDayStart [2] Timestamp OPTIONAL, - timeOfDayEnd [3] Timestamp OPTIONAL -} - -Day ::= ENUMERATED -{ - monday(1), - tuesday(2), - wednesday(3), - thursday(4), - friday(5), - saturday(6), - sunday(7) -} - -TrafficProfile ::= ENUMERATED -{ - singleTransUL(1), - singleTransDL(2), - dualTransULFirst(3), - dualTransDLFirst(4), - multiTrans(5) + lINotification [1] LINotification } -ScheduledCommunicationType ::= ENUMERATED -{ - downlinkOnly(1), - uplinkOnly(2), - bidirectional(3) -} - --- ================= --- 5G NEF parameters --- ================= - -NEFFailureCause ::= ENUMERATED -{ - userUnknown(1), - niddConfigurationNotAvailable(2), - contextNotFound(3), - portNotFree(4), - portNotAssociatedWithSpecifiedApplication(5) -} - -NEFReleaseCause ::= ENUMERATED -{ - sMFRelease(1), - dNRelease(2), - uDMRelease(3), - cHFRelease(4), - localConfigurationPolicy(5), - unknownCause(6) -} - -AFID ::= UTF8String - -NEFID ::= UTF8String - --- ================== --- SCEF definitions --- ================== - --- See clause 7.8.2.1.2 for details of this structure -SCEFPDNConnectionEstablishment ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - iMEI [4] IMEI OPTIONAL, - ePSBearerID [5] EPSBearerID, - sCEFID [6] SCEFID, - aPN [7] APN, - rDSSupport [8] RDSSupport, - sCSASID [9] SCSASID -} - --- See clause 7.8.2.1.3 for details of this structure -SCEFPDNConnectionUpdate ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - initiator [4] Initiator, - rDSSourcePortNumber [5] RDSPortNumber OPTIONAL, - rDSDestinationPortNumber [6] RDSPortNumber OPTIONAL, - applicationID [7] ApplicationID OPTIONAL, - sCSASID [8] SCSASID OPTIONAL, - rDSAction [9] RDSAction OPTIONAL, - serializationFormat [10] SerializationFormat OPTIONAL -} - --- See clause 7.8.2.1.4 for details of this structure -SCEFPDNConnectionRelease ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - ePSBearerID [4] EPSBearerID, - timeOfFirstPacket [5] Timestamp OPTIONAL, - timeOfLastPacket [6] Timestamp OPTIONAL, - uplinkVolume [7] INTEGER OPTIONAL, - downlinkVolume [8] INTEGER OPTIONAL, - releaseCause [9] SCEFReleaseCause -} - --- See clause 7.8.2.1.5 for details of this structure -SCEFUnsuccessfulProcedure ::= SEQUENCE -{ - failureCause [1] SCEFFailureCause, - iMSI [2] IMSI OPTIONAL, - mSISDN [3] MSISDN OPTIONAL, - externalIdentifier [4] NAI OPTIONAL, - ePSBearerID [5] EPSBearerID, - aPN [6] APN, - rDSDestinationPortNumber [7] RDSPortNumber OPTIONAL, - applicationID [8] ApplicationID OPTIONAL, - sCSASID [9] SCSASID -} - --- See clause 7.8.2.1.6 for details of this structure -SCEFStartOfInterceptionWithEstablishedPDNConnection ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - iMEI [4] IMEI OPTIONAL, - ePSBearerID [5] EPSBearerID, - sCEFID [6] SCEFID, - aPN [7] APN, - rDSSupport [8] RDSSupport, - sCSASID [9] SCSASID -} - --- See clause 7.8.3.1.1 for details of this structure -SCEFDeviceTrigger ::= SEQUENCE -{ - iMSI [1] IMSI, - mSISDN [2] MSISDN, - externalIdentifier [3] NAI, - triggerId [4] TriggerID, - sCSASID [5] SCSASID OPTIONAL, - triggerPayload [6] TriggerPayload OPTIONAL, - validityPeriod [7] INTEGER OPTIONAL, - priorityDT [8] PriorityDT OPTIONAL, - sourcePortId [9] PortNumber OPTIONAL, - destinationPortId [10] PortNumber OPTIONAL -} - --- See clause 7.8.3.1.2 for details of this structure -SCEFDeviceTriggerReplace ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - triggerId [4] TriggerID, - sCSASID [5] SCSASID OPTIONAL, - triggerPayload [6] TriggerPayload OPTIONAL, - validityPeriod [7] INTEGER OPTIONAL, - priorityDT [8] PriorityDT OPTIONAL, - sourcePortId [9] PortNumber OPTIONAL, - destinationPortId [10] PortNumber OPTIONAL -} - --- See clause 7.8.3.1.3 for details of this structure -SCEFDeviceTriggerCancellation ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - triggerId [4] TriggerID -} - --- See clause 7.8.3.1.4 for details of this structure -SCEFDeviceTriggerReportNotify ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifier [3] NAI OPTIONAL, - triggerId [4] TriggerID, - deviceTriggerDeliveryResult [5] DeviceTriggerDeliveryResult -} - --- See clause 7.8.4.1.1 for details of this structure -SCEFMSISDNLessMOSMS ::= SEQUENCE -{ - iMSI [1] IMSI OPTIONAL, - mSISDN [2] MSISDN OPTIONAL, - externalIdentifie [3] NAI OPTIONAL, - terminatingSMSParty [4] SCSASID, - sMS [5] SMSTPDUData OPTIONAL, - sourcePort [6] PortNumber OPTIONAL, - destinationPort [7] PortNumber OPTIONAL -} - --- See clause 7.8.5.1.1 for details of this structure -SCEFCommunicationPatternUpdate ::= SEQUENCE -{ - mSISDN [1] MSISDN OPTIONAL, - externalIdentifier [2] NAI OPTIONAL, - periodicCommunicationIndicator [3] PeriodicCommunicationIndicator OPTIONAL, - communicationDurationTime [4] INTEGER OPTIONAL, - periodicTime [5] INTEGER OPTIONAL, - scheduledCommunicationTime [6] ScheduledCommunicationTime OPTIONAL, - scheduledCommunicationType [7] ScheduledCommunicationType OPTIONAL, - stationaryIndication [8] StationaryIndication OPTIONAL, - batteryIndication [9] BatteryIndication OPTIONAL, - trafficProfile [10] TrafficProfile OPTIONAL, - expectedUEMovingTrajectory [11] SEQUENCE OF UMTLocationArea5G OPTIONAL, - sCSASID [13] SCSASID, - validityTime [14] Timestamp OPTIONAL -} - --- ================= --- SCEF parameters --- ================= - -SCEFFailureCause ::= ENUMERATED -{ - userUnknown(1), - niddConfigurationNotAvailable(2), - invalidEPSBearer(3), - operationNotAllowed(4), - portNotFree(5), - portNotAssociatedWithSpecifiedApplication(6) -} - -SCEFReleaseCause ::= ENUMERATED -{ - mMERelease(1), - dNRelease(2), - hSSRelease(3), - localConfigurationPolicy(4), - unknownCause(5) -} - -SCSASID ::= UTF8String - -SCEFID ::= UTF8String - -PeriodicCommunicationIndicator ::= ENUMERATED -{ - periodic(1), - nonPeriodic(2) -} - -EPSBearerID ::= INTEGER (0..255) - -APN ::= UTF8String - - -- ================== -- 5G AMF definitions -- ================== @@ -832,10 +290,7 @@ AMFRegistration ::= SEQUENCE gUTI [8] FiveGGUTI, location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, - fiveGSTAIList [11] TAIList OPTIONAL, - sMSOverNasIndicator [12] SMSOverNASIndicator OPTIONAL, - oldGUTI [13] EPS5GGUTI OPTIONAL, - eMM5GRegStatus [14] EMM5GMMStatus OPTIONAL + fiveGSTAIList [11] TAIList OPTIONAL } -- See clause 6.2.2.2.3 for details of this structure @@ -849,9 +304,7 @@ AMFDeregistration ::= SEQUENCE gPSI [6] GPSI OPTIONAL, gUTI [7] FiveGGUTI OPTIONAL, cause [8] FiveGMMCause OPTIONAL, - location [9] Location OPTIONAL, - switchOffIndicator [10] SwitchOffIndicator OPTIONAL, - reRegRequiredIndicator [11] ReRegRequiredIndicator OPTIONAL + location [9] Location OPTIONAL } -- See clause 6.2.2.2.4 for details of this structure @@ -862,9 +315,7 @@ AMFLocationUpdate ::= SEQUENCE pEI [3] PEI OPTIONAL, gPSI [4] GPSI OPTIONAL, gUTI [5] FiveGGUTI OPTIONAL, - location [6] Location, - sMSOverNASIndicator [7] SMSOverNASIndicator OPTIONAL, - oldGUTI [8] EPS5GGUTI OPTIONAL + location [6] Location } -- See clause 6.2.2.2.5 for details of this structure @@ -881,10 +332,7 @@ AMFStartOfInterceptionWithRegisteredUE ::= SEQUENCE location [9] Location OPTIONAL, non3GPPAccessEndpoint [10] UEEndpointAddress OPTIONAL, timeOfRegistration [11] Timestamp OPTIONAL, - fiveGSTAIList [12] TAIList OPTIONAL, - sMSOverNASIndicator [13] SMSOverNASIndicator OPTIONAL, - oldGUTI [14] EPS5GGUTI OPTIONAL, - eMM5GRegStatus [15] EMM5GMMStatus OPTIONAL + fiveGSTAIList [12] TAIList OPTIONAL } -- See clause 6.2.2.2.6 for details of this structure @@ -1192,8 +640,6 @@ SMFMAUnsuccessfulProcedure ::= SEQUENCE -- 5G SMF parameters -- ================= -SMFID ::= UTF8String - SMFFailedProcedureType ::= ENUMERATED { pDUSessionEstablishment(1), @@ -1236,10 +682,10 @@ SMFMAAcceptedIndication ::= BOOLEAN -- see Clause 6.1.6.3.8 of TS 29.502[16] for the details of this structure. SMFErrorCodes ::= UTF8String --- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. +-- see Clause 6.1.6.3.2 of TS 29.502[16] for details of this structure. UEEPSPDNConnection ::= OCTET STRING --- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. +-- see Clause 6.1.6.3.6 of TS 29.502[16] for the details of this structure. RequestIndication ::= ENUMERATED { uEREQPDUSESMOD(0), @@ -1282,7 +728,7 @@ QFI ::= INTEGER (0..63) -- 5G UDM definitions -- ================== -UDMServingSystemMessage ::= SEQUENCE +UDMServingSystemMessage ::= SEQUENCE { sUPI [1] SUPI, pEI [2] PEI OPTIONAL, @@ -1508,7 +954,7 @@ MMSSendByNonLocalTarget ::= SEQUENCE dRMContent [23] BOOLEAN OPTIONAL, adaptationAllowed [24] MMSAdaptation OPTIONAL } - + MMSNotification ::= SEQUENCE { transactionID [1] UTF8String, @@ -1524,7 +970,7 @@ MMSNotification ::= SEQUENCE expiry [11] MMSExpiry, replyCharging [12] MMSReplyCharging OPTIONAL } - + MMSSendToNonLocalTarget ::= SEQUENCE { version [1] MMSVersion, @@ -1578,7 +1024,7 @@ MMSRetrieval ::= SEQUENCE state [12] MMState OPTIONAL, flags [13] MMFlags OPTIONAL, messageClass [14] MMSMessageClass OPTIONAL, - priority [15] MMSPriority, + priority [15] MMSPriority, deliveryReport [16] BOOLEAN OPTIONAL, readReport [17] BOOLEAN OPTIONAL, replyCharging [18] MMSReplyCharging OPTIONAL, @@ -1612,7 +1058,7 @@ MMSForward ::= SEQUENCE cCRecipients [6] SEQUENCE OF MMSParty OPTIONAL, bCCRecipients [7] SEQUENCE OF MMSParty OPTIONAL, direction [8] MMSDirection, - expiry [9] MMSExpiry OPTIONAL, + expiry [9] MMSExpiry OPTIONAL, desiredDeliveryTime [10] Timestamp OPTIONAL, deliveryReportAllowed [11] BOOLEAN OPTIONAL, deliveryReport [12] BOOLEAN OPTIONAL, @@ -1624,10 +1070,10 @@ MMSForward ::= SEQUENCE responseStatus [18] MMSResponseStatus, responseStatusText [19] UTF8String OPTIONAL, messageID [20] UTF8String OPTIONAL, - contentLocationConf [21] UTF8String OPTIONAL, + contentLocationConf [21] UTF8String OPTIONAL, storeStatus [22] MMSStoreStatus OPTIONAL, storeStatusText [23] UTF8String OPTIONAL -} +} MMSDeleteFromRelay ::= SEQUENCE { @@ -1645,13 +1091,13 @@ MMSMBoxStore ::= SEQUENCE transactionID [1] UTF8String, version [2] MMSVersion, direction [3] MMSDirection, - contentLocationReq [4] UTF8String, + contentLocationReq [4] UTF8String, state [5] MMState OPTIONAL, flags [6] MMFlags OPTIONAL, - contentLocationConf [7] UTF8String OPTIONAL, + contentLocationConf [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL -} +} MMSMBoxUpload ::= SEQUENCE { @@ -1661,11 +1107,11 @@ MMSMBoxUpload ::= SEQUENCE state [4] MMState OPTIONAL, flags [5] MMFlags OPTIONAL, contentType [6] UTF8String, - contentLocation [7] UTF8String OPTIONAL, + contentLocation [7] UTF8String OPTIONAL, storeStatus [8] MMSStoreStatus, storeStatusText [9] UTF8String OPTIONAL, mMessages [10] SEQUENCE OF MMBoxDescription -} +} MMSMBoxDelete ::= SEQUENCE { @@ -1745,7 +1191,7 @@ MMSCancel ::= SEQUENCE version [2] MMSVersion, cancelID [3] UTF8String, direction [4] MMSDirection -} +} MMSMBoxViewRequest ::= SEQUENCE { @@ -1802,7 +1248,7 @@ MMBoxDescription ::= SEQUENCE -- ========= -- MMS CCPDU -- ========= - + MMSCCPDU ::= SEQUENCE { version [1] MMSVersion, @@ -1868,7 +1314,7 @@ MMSDeleteResponseStatus ::= ENUMERATED errorPermanentReplyChargingNotSupported(24), errorPermanentAddressHidingNotSupported(25), errorPermanentLackOfPrepaid(26) -} +} MMSDirection ::= ENUMERATED { @@ -1883,13 +1329,13 @@ MMSElementDescriptor ::= SEQUENCE value [3] UTF8String OPTIONAL } -MMSExpiry ::= SEQUENCE +MMSExpiry ::= SEQUENCE { expiryPeriod [1] INTEGER, - periodFormat [2] MMSPeriodFormat + periodFormat [2] MMSPeriodFormat } -MMFlags ::= SEQUENCE +MMFlags ::= SEQUENCE { length [1] INTEGER, flag [2] MMStateFlag, @@ -1919,7 +1365,7 @@ MMSPartyID ::= CHOICE iMPI [5] IMPI, sUPI [6] SUPI, gPSI [7] GPSI -} +} MMSPeriodFormat ::= ENUMERATED { @@ -2067,7 +1513,7 @@ MMSVersion ::= SEQUENCE { majorVersion [1] INTEGER, minorVersion [2] INTEGER -} +} -- ================== -- 5G PTC definitions @@ -2260,12 +1706,11 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } - --- ========= +-- ================= -- PTC CCPDU --- ========= - -PTCCCPDU ::= OCTET STRING +-- ================= + +PTCCCPDU ::= OCTET STRING -- ================= @@ -2311,7 +1756,7 @@ PTCIdentifiers ::= CHOICE PTCSessionInfo ::= SEQUENCE { - pTCSessionURI [1] UTF8String, + pTCSessionURI [1] UTF8String, pTCSessionType [2] PTCSessionType } @@ -2460,7 +1905,7 @@ PTCAccessPolicyFailure ::= ENUMERATED { requestUnsuccessful(1), requestUnknown(2) -} +} -- =================== -- 5G LALS definitions @@ -2469,7 +1914,7 @@ PTCAccessPolicyFailure ::= ENUMERATED LALSReport ::= SEQUENCE { sUPI [1] SUPI OPTIONAL, --- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number + -- pEI [2] PEI OPTIONAL, deprecated in Release-16, do not re-use this tag number gPSI [3] GPSI OPTIONAL, location [4] Location OPTIONAL, iMPU [5] IMPU OPTIONAL, @@ -2483,7 +1928,7 @@ LALSReport ::= SEQUENCE PDHeaderReport ::= SEQUENCE { - pDUSessionID [1] PDUSessionID, + pDUSessionID [1] PDUSessionID, sourceIPAddress [2] IPAddress, sourcePort [3] PortNumber OPTIONAL, destinationIPAddress [4] IPAddress, @@ -2553,6 +1998,14 @@ MMEIdentifierAssocation ::= SEQUENCE -- Identifier Association parameters -- ================================= +GUTI ::= SEQUENCE +{ + mCC [1] MCC, + mNC [2] MNC, + mMEGroupID [3] MMEGroupID, + mMECode [4] MMECode, + mTMSI [5] TMSI +} MMEGroupID ::= OCTET STRING (SIZE(2)) @@ -2560,144 +2013,6 @@ MMECode ::= OCTET STRING (SIZE(1)) TMSI ::= OCTET STRING (SIZE(4)) --- =================== --- EPS MME definitions --- =================== - -MMEAttach ::= SEQUENCE -{ - attachType [1] EPSAttachType, - attachResult [2] EPSAttachResult, - iMSI [3] IMSI, - iMEI [4] IMEI OPTIONAL, - mSISDN [5] MSISDN OPTIONAL, - gUTI [6] GUTI OPTIONAL, - location [7] Location OPTIONAL, - ePSTAIList [8] TAIList OPTIONAL, - sMSServiceStatus [9] EPSSMSServiceStatus OPTIONAL, - oldGUTI [10] GUTI OPTIONAL, - eMM5GRegStatus [11] EMM5GMMStatus OPTIONAL -} - -MMEDetach ::= SEQUENCE -{ - detachDirection [1] MMEDirection, - detachType [2] EPSDetachType, - iMSI [3] IMSI, - iMEI [4] IMEI OPTIONAL, - mSISDN [5] MSISDN OPTIONAL, - gUTI [6] GUTI OPTIONAL, - cause [7] EMMCause OPTIONAL, - location [8] Location OPTIONAL, - switchOffIndicator [9] SwitchOffIndicator OPTIONAL -} - -MMELocationUpdate ::= SEQUENCE -{ - iMSI [1] IMSI, - iMEI [2] IMEI OPTIONAL, - mSISDN [3] MSISDN OPTIONAL, - gUTI [4] GUTI OPTIONAL, - location [5] Location OPTIONAL, - oldGUTI [6] GUTI OPTIONAL, - sMSServiceStatus [7] EPSSMSServiceStatus OPTIONAL -} - -MMEStartOfInterceptionWithEPSAttachedUE ::= SEQUENCE -{ - attachType [1] EPSAttachType, - attachResult [2] EPSAttachResult, - iMSI [3] IMSI, - iMEI [4] IMEI OPTIONAL, - mSISDN [5] MSISDN OPTIONAL, - gUTI [6] GUTI OPTIONAL, - location [7] Location OPTIONAL, - ePSTAIList [9] TAIList OPTIONAL, - sMSServiceStatus [10] EPSSMSServiceStatus OPTIONAL, - eMM5GRegStatus [12] EMM5GMMStatus OPTIONAL -} - -MMEUnsuccessfulProcedure ::= SEQUENCE -{ - failedProcedureType [1] MMEFailedProcedureType, - failureCause [2] MMEFailureCause, - iMSI [3] IMSI OPTIONAL, - iMEI [4] IMEI OPTIONAL, - mSISDN [5] MSISDN OPTIONAL, - gUTI [6] GUTI OPTIONAL, - location [7] Location OPTIONAL -} - --- ================== --- EPS MME parameters --- ================== - -EMMCause ::= INTEGER (0..255) - -ESMCause ::= INTEGER (0..255) - -EPSAttachType ::= ENUMERATED -{ - ePSAttach(1), - combinedEPSIMSIAttach(2), - ePSRLOSAttach(3), - ePSEmergencyAttach(4), - reserved(5) -} - -EPSAttachResult ::= ENUMERATED -{ - ePSOnly(1), - combinedEPSIMSI(2) -} - - -EPSDetachType ::= ENUMERATED -{ - ePSDetach(1), - iMSIDetach(2), - combinedEPSIMSIDetach(3), - reAttachRequired(4), - reAttachNotRequired(5), - reserved(6) -} - -EPSSMSServiceStatus ::= ENUMERATED -{ - sMSServicesNotAvailable(1), - sMSServicesNotAvailableInThisPLMN(2), - networkFailure(3), - congestion(4) -} - -MMEDirection ::= ENUMERATED -{ - networkInitiated(1), - uEInitiated(2) -} - -MMEFailedProcedureType ::= ENUMERATED -{ - attachReject(1), - authenticationReject(2), - securityModeReject(3), - serviceReject(4), - trackingAreaUpdateReject(5), - activateDedicatedEPSBearerContextReject(6), - activateDefaultEPSBearerContextReject(7), - bearerResourceAllocationReject(8), - bearerResourceModificationReject(9), - modifyEPSBearerContectReject(10), - pDNConnectivityReject(11), - pDNDisconnectReject(12) -} - -MMEFailureCause ::= CHOICE -{ - eMMCause [1] EMMCause, - eSMCause [2] ESMCause -} - -- =========================== -- LI Notification definitions -- =========================== @@ -2735,35 +2050,6 @@ LIAppliedDeliveryInformation ::= SEQUENCE -- =============== MDFCellSiteReport ::= SEQUENCE OF CellInformation --- ============================== --- 5G EPS Interworking Parameters --- ============================== - - -EMM5GMMStatus ::= SEQUENCE -{ - eMMRegStatus [1] EMMRegStatus OPTIONAL, - fiveGMMStatus [2] FiveGMMStatus OPTIONAL -} - - -EPS5GGUTI ::= CHOICE -{ - gUTI [1] GUTI, - fiveGGUTI [2] FiveGGUTI -} - -EMMRegStatus ::= ENUMERATED -{ - uEEMMRegistered(1), - uENotEMMRegistered(2) -} - -FiveGMMStatus ::= ENUMERATED -{ - uE5GMMRegistered(1), - uENot5GMMRegistered(2) -} -- ================= -- Common Parameters @@ -2841,15 +2127,6 @@ GUMMEI ::= SEQUENCE mNC [3] MNC } -GUTI ::= SEQUENCE -{ - mCC [1] MCC, - mNC [2] MNC, - mMEGroupID [3] MMEGroupID, - mMECode [4] MMECode, - mTMSI [5] TMSI -} - HomeNetworkPublicKeyID ::= OCTET STRING HSMFURI ::= UTF8String @@ -2973,12 +2250,6 @@ RejectedSNSSAI ::= SEQUENCE RejectedSliceCauseValue ::= INTEGER (0..255) -ReRegRequiredIndicator ::= ENUMERATED -{ - reRegistrationRequired(1), - reRegistrationNotRequired(2) -} - RoutingIndicator ::= INTEGER (0..9999) SchemeOutput ::= OCTET STRING @@ -2994,13 +2265,6 @@ Slice ::= SEQUENCE SMPDUDNRequest ::= OCTET STRING --- TS 24.501 [13], clause 9.11.3.6.1 -SMSOverNASIndicator ::= ENUMERATED -{ - sMSOverNASNotAllowed(1), - sMSOverNASAllowed(2) -} - SNSSAI ::= SEQUENCE { sliceServiceType [1] INTEGER (0..255), @@ -3025,12 +2289,6 @@ SUPI ::= CHOICE SUPIUnauthenticatedIndication ::= BOOLEAN -SwitchOffIndicator ::= ENUMERATED -{ - normalDetach(1), - switchOff(2) -} - TargetIdentifier ::= CHOICE { sUPI [1] SUPI, @@ -3070,10 +2328,9 @@ UEEndpointAddress ::= CHOICE Location ::= SEQUENCE { - locationInfo [1] LocationInfo OPTIONAL, - positioningInfo [2] PositioningInfo OPTIONAL, - locationPresenceReport [3] LocationPresenceReport OPTIONAL, - ePSLocationInfo [4] EPSLocationInfo OPTIONAL + locationInfo [1] LocationInfo OPTIONAL, + positioningInfo [2] PositioningInfo OPTIONAL, + locationPresenceReport [3] LocationPresenceReport OPTIONAL } CellSiteInformation ::= SEQUENCE @@ -3087,7 +2344,7 @@ CellSiteInformation ::= SEQUENCE LocationInfo ::= SEQUENCE { userLocation [1] UserLocation OPTIONAL, - currentLoc [2] BOOLEAN OPTIONAL, + currentLoc [2] BOOLEAN OPTIONAL, geoInfo [3] GeographicArea OPTIONAL, rATType [4] RATType OPTIONAL, timeZone [5] TimeZone OPTIONAL, @@ -3107,10 +2364,10 @@ EUTRALocation ::= SEQUENCE { tAI [1] TAI, eCGI [2] ECGI, - ageOfLocationInfo [3] INTEGER OPTIONAL, + ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, - geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geographicalInformation [5] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalNGENbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL, globalENbID [9] GlobalRANNodeID OPTIONAL @@ -3121,10 +2378,10 @@ NRLocation ::= SEQUENCE { tAI [1] TAI, nCGI [2] NCGI, - ageOfLocationInfo [3] INTEGER OPTIONAL, + ageOfLocatonInfo [3] INTEGER OPTIONAL, uELocationTimestamp [4] Timestamp OPTIONAL, geographicalInformation [5] UTF8String OPTIONAL, - geodeticInformation [6] UTF8String OPTIONAL, + geodeticInformation [6] UTF8String OPTIONAL, globalGNbID [7] GlobalRANNodeID OPTIONAL, cellSiteInformation [8] CellSiteInformation OPTIONAL } @@ -3133,7 +2390,7 @@ NRLocation ::= SEQUENCE N3GALocation ::= SEQUENCE { tAI [1] TAI OPTIONAL, - n3IWFID [2] N3IWFIDNGAP OPTIONAL, + n3IWFID [2] N3IWFIDNGAP OPTIONAL, uEIPAddr [3] IPAddr OPTIONAL, portNumber [4] INTEGER OPTIONAL, tNAPID [5] TNAPID OPTIONAL, @@ -3180,37 +2437,12 @@ TAI ::= SEQUENCE nID [3] NID OPTIONAL } -CGI ::= SEQUENCE -{ - lAI [1] LAI, - cellID [2] CellID -} - -LAI ::= SEQUENCE -{ - pLMNID [1] PLMNID, - lAC [2] LAC -} - -LAC ::= OCTET STRING (SIZE(2)) - -CellID ::= OCTET STRING (SIZE(2)) - -SAI ::= SEQUENCE -{ - pLMNID [1] PLMNID, - lAC [2] LAC, - sAC [3] SAC -} - -SAC ::= OCTET STRING (SIZE(2)) - -- TS 29.571 [17], clause 5.4.4.5 ECGI ::= SEQUENCE { pLMNID [1] PLMNID, eUTRACellID [2] EUTRACellID, - nID [3] NID OPTIONAL + nID [3] NID OPTIONAL } TAIList ::= SEQUENCE OF TAI @@ -3229,7 +2461,7 @@ RANCGI ::= CHOICE nCGI [2] NCGI } -CellInformation ::= SEQUENCE +CellInformation ::= SEQUENCE { rANCGI [1] RANCGI, cellSiteinformation [2] CellSiteInformation OPTIONAL, @@ -3320,12 +2552,12 @@ ENbID ::= CHOICE PositioningInfo ::= SEQUENCE { positionInfo [1] LocationData OPTIONAL, - rawMLPResponse [2] RawMLPResponse OPTIONAL + rawMLPResponse [2] RawMLPResponse OPTIONAL } RawMLPResponse ::= CHOICE { - -- The following parameter contains a copy of unparsed XML code of the + -- The following parameter contains a copy of unparsed XML code of the -- MLP response message, i.e. the entire XML document containing -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.2) or -- a (described in OMA-TS-MLP-V3_5-20181211-C [20], clause 5.2.3.2.3) MLP message. @@ -3350,25 +2582,6 @@ LocationData ::= SEQUENCE barometricPressure [11] BarometricPressure OPTIONAL } --- TS 29.172 [53], table 6.2.2-2 -EPSLocationInfo ::= SEQUENCE -{ - locationData [1] LocationData, - cGI [2] CGI OPTIONAL, - sAI [3] SAI OPTIONAL, - eSMLCCellInfo [4] ESMLCCellInfo OPTIONAL -} - --- TS 29.172 [53], clause 7.4.57 -ESMLCCellInfo ::= SEQUENCE -{ - eCGI [1] ECGI, - cellPortionID [2] CellPortionID -} - --- TS 29.171 [54], clause 7.4.31 -CellPortionID ::= INTEGER (0..4095) - -- TS 29.518 [22], clause 6.2.6.2.5 LocationPresenceReport ::= SEQUENCE { @@ -3644,7 +2857,7 @@ HorizontalVelocityWithUncertainty ::= SEQUENCE -- TS 29.572 [24], clause 6.1.6.2.21 HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE { - hSpeed [1] HorizontalSpeed, + hspeed [1] HorizontalSpeed, bearing [2] Angle, vSpeed [3] VerticalSpeed, vDirection [4] VerticalDirection, @@ -3652,7 +2865,7 @@ HorizontalWithVerticalVelocityAndUncertainty ::= SEQUENCE vUncertainty [6] SpeedUncertainty } --- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 +-- The following types are described in TS 29.572 [24], table 6.1.6.3.2-1 Altitude ::= UTF8String Angle ::= INTEGER (0..360) Uncertainty ::= INTEGER (0..127) -- GitLab From 7aed44bed89bd7f28e16131a29c6bff9edb1d905 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Sep 2021 08:22:54 +0100 Subject: [PATCH 32/41] Correcting spaces --- 33128/r16/TS33128Payloads.asn | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 6a2759b..3867db6 100644 --- a/33128/r16/TS33128Payloads.asn +++ b/33128/r16/TS33128Payloads.asn @@ -255,7 +255,6 @@ CCPDU ::= CHOICE extendedUPFCCPDU [2] ExtendedUPFCCPDU, mMSCCPDU [3] MMSCCPDU, pTCCCPDU [4] PTCCCPDU - } -- =========================== @@ -1706,12 +1705,11 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } --- ================= +-- ========= -- PTC CCPDU --- ================= - -PTCCCPDU ::= OCTET STRING +-- ========= +PTCCCPDU ::= OCTET STRING -- ================= -- 5G PTC parameters -- GitLab From 1723143791a4b9a97fc62487c1acd39d6b1eb8e8 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Sep 2021 08:40:09 +0100 Subject: [PATCH 33/41] Changes to Nokia's comments in IRIEvent plus editorials --- 33128/r17/TS33128Payloads.asn | 71 ++++++++++++++++------------------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 2de8d2e..9e97336 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -146,28 +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, - -- AKMA key management events, see clause 7.X.1 - aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, - aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, - aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, - aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh, - aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey, - aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment, - aFApplicationKeyRemoval [1008] AFApplicationKeyRemoval, + -- 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.X.3.3 - n9HRPDUSessionInfo [2491] N9HRPDUSessionInfo, - s8HRBearerInfo [2492] S8HRBearerInfo + -- HR LI Events, see clause 7.10.3.3 + n9HRPDUSessionInfo [100] N9HRPDUSessionInfo, + s8HRBearerInfo [101] S8HRBearerInfo } -- ============== @@ -307,27 +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, - -- tag 2491 is reserved because there is no equivalent IRI for the xIRI n9HRPDUSessionInfo - -- tag 2492 is reserved because there is no equivalent IRI for the xIRI S8HRBearerInfo + -- 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 - -- AKMA key management Events, see clause 7.X.1 - aAnFAnchorKeyRegister [1001] AAnFAnchorKeyRegister, - aAnFKAKMAApplicationKeyGet [1002] AAnFKAKMAApplicationKeyGet, - aAnFStartOfInterceptWithEstablishedAKMAKeyMaterial [1003] AAnFStartOfInterceptWithEstablishedAKMAKeyMaterial, - aAnFAKMAContextRemovalRecord [1004] AAnFAKMAContextRemovalRecord, - aFAKMAApplicationKeyRefresh [1005] AFAKMAApplicationKeyRefresh, - aFStartOfInterceptWithEstablishedAKMAApplicationKey [1006] AFStartOfInterceptWithEstablishedAKMAApplicationKey, - aFAuxiliarySecurityParameterEstablishment [1007] AFAuxiliarySecurityParameterEstablishment, - aFApplicationKeyRemoval [1008] 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 @@ -926,7 +926,6 @@ AAnFAKMAContextRemovalRecord ::= SEQUENCE nFID [2] NFID } - -- ====================== -- AKMA common parameters -- ====================== @@ -943,7 +942,6 @@ AKMAAFID ::= SEQUENCE uaProtocolID [2] UAProtocolID } - UAStarParams ::= CHOICE { tls12 [1] TLS12UAStarParams, @@ -981,7 +979,7 @@ TLSPRFAlgorithm ::= ENUMERATED 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, @@ -1006,7 +1004,6 @@ KAF ::= OCTET STRING KAKMA ::= OCTET STRING - -- ==================== -- AKMA AAnF parameters -- ==================== @@ -1024,12 +1021,10 @@ AFKeyInfo ::= SEQUENCE kAFExpTime [3] KAFExpiryTime } - -- ======================= -- AKMA AF definitions -- ======================= - AFAKMAApplicationKeyRefresh ::= SEQUENCE { aFID [1] AFID, @@ -1086,7 +1081,6 @@ AFKeyRemovalCause ::= ENUMERATED applicationSpecific(3) } - -- ================== -- 5G AMF definitions -- ================== @@ -2534,12 +2528,11 @@ PTCAccessPolicy ::= SEQUENCE pTCAccessPolicyFailure [7] PTCAccessPolicyFailure OPTIONAL } - --- ================= +-- ========= -- PTC CCPDU --- ================= +-- ========= -PTCCCPDU ::= OCTET STRING +PTCCCPDU ::= OCTET STRING -- ================= -- 5G PTC parameters @@ -4018,4 +4011,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END +END \ No newline at end of file -- GitLab From 915ddbe91b2e8c8bd170db4a2ce0edd4a34ba1bc Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Sep 2021 08:52:05 +0100 Subject: [PATCH 34/41] Reverting 280 namespace to common to match existing convention --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 22f2bd7..e97fbd7 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -1,7 +1,7 @@ @@ -62,16 +62,16 @@ - - + + - - + + @@ -178,8 +178,8 @@ - - + + @@ -240,7 +240,7 @@ - + -- GitLab From 835060655f49ae9d330688069c5f767a90457e22 Mon Sep 17 00:00:00 2001 From: mark Date: Tue, 14 Sep 2021 08:57:39 +0100 Subject: [PATCH 35/41] Tidying up --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index e97fbd7..7d3cb21 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -15,7 +15,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -277,5 +277,4 @@ - - + \ No newline at end of file -- GitLab From 1aae6503374211880bbf5fee376523be05afd840 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 15 Sep 2021 08:36:05 +0200 Subject: [PATCH 36/41] Updating module OID --- 33128/r16/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r16/TS33128Payloads.asn b/33128/r16/TS33128Payloads.asn index 3867db6..5c54007 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)} -- GitLab From 983a450c66964b72e7c16fd153a036e7e7de5a73 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 15 Sep 2021 08:37:05 +0200 Subject: [PATCH 37/41] Updating version part of namespace --- 33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 4b1e0b4..99957b6 100644 --- a/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r16/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ -- GitLab From 6294398f1b39753ec15310e86343db744c749d2d Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 15 Sep 2021 08:37:32 +0200 Subject: [PATCH 38/41] Updating version part of namespace --- 33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd index 1afceff..d824321 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd @@ -1,9 +1,9 @@ -- GitLab From f6e4574a5fb10ce5b1469f64d78881ab1f34d88a Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 15 Sep 2021 08:43:17 +0200 Subject: [PATCH 39/41] Correcting TS12UAStarParams tagging --- 33128/r17/TS33128Payloads.asn | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 9e97336..7455ce2 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -948,9 +948,9 @@ UAStarParams ::= CHOICE generic [2] GenericUAStarParams } -GenericUAStarParams ::= SEQUENCE +GenericUAStarParams ::= SEQUENCE { - genericClientParams [1] OCTET STRING, + genericClientParams [1] OCTET STRING, genericServerParams [2] OCTET STRING } @@ -981,7 +981,7 @@ TLSCipherSuite ::= SEQUENCE (SIZE(2)) OF INTEGER (0..255) TLS12UAStarParams ::= SEQUENCE { preMasterSecret [1] OCTET STRING (SIZE(6)) OPTIONAL, - masterSecret [2] OCTET STRING (SIZE(6)), + masterSecret [2] OCTET STRING (SIZE(6)), pRFAlgorithm [3] TLSPRFAlgorithm, cipherSuite [4] TLSCipherSuite, cipherType [5] TLSCipherType, @@ -989,15 +989,15 @@ TLS12UAStarParams ::= SEQUENCE 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)), - clientSequenceNumber [16] INTEGER, - serverSequenceNumber [17] INTEGER, - sessionID [18] OCTET STRING (SIZE(0..32)), - tLSExtensions [19] OCTET STRING (SIZE(0..65535)) + 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 @@ -1049,7 +1049,7 @@ AFSecurityParams ::= SEQUENCE { aFID [1] AFID, aKID [2] NAI, - kAF [3] KAF, + kAF [3] KAF, uaStarParams [4] UAStarParams } @@ -1064,12 +1064,12 @@ AFApplicationKeyRemoval ::= SEQUENCE -- AKMA AF parameters -- =================== -KAFParams ::= SEQUENCE +KAFParams ::= SEQUENCE { aKID [1] NAI, kAF [2] KAF, kAFExpTime [3] KAFExpiryTime, - uaStarParams [4] UAStarParams + uaStarParams [4] UAStarParams } KAFExpiryTime ::= GeneralizedTime -- GitLab From 2263ee1270117aa00c07bf93304f744971e848e8 Mon Sep 17 00:00:00 2001 From: canterburym Date: Wed, 15 Sep 2021 08:43:41 +0200 Subject: [PATCH 40/41] Adding space for consistency --- 33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd index 7d3cb21..2a89264 100644 --- a/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd +++ b/33128/r17/urn_3GPP_ns_li_3GPPX1Extensions.xsd @@ -5,7 +5,7 @@ targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r17:v1" elementFormDefault="qualified"> - + -- GitLab From bd01b8d97781fe2f703a87678ce2d5dccfd4428d Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 17 Sep 2021 18:01:04 +0200 Subject: [PATCH 41/41] Removing whitespace --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 7455ce2..dc00dcb 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1069,7 +1069,7 @@ KAFParams ::= SEQUENCE aKID [1] NAI, kAF [2] KAF, kAFExpTime [3] KAFExpiryTime, - uaStarParams [4] UAStarParams + uaStarParams [4] UAStarParams } KAFExpiryTime ::= GeneralizedTime -- GitLab