Commit fc93beca authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA108' into 'main' 

Output from SA#108

See merge request !314
parents 48715d05 4d624226

33128/r16/TS33128Payloads.asn

+23 −11
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version16(16)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r16(16) version17(17)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version16(16)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r16(16) version17(17)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -58,7 +58,7 @@ XIRIEvent ::= CHOICE 


    -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent



    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([65-66] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -120,9 +120,15 @@ XIRIEvent ::= CHOICE 
    -- PDU to MA PDU session-related events, see clause 6.2.3.2.8

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,

    

    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [65] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [66] MMSConvertedToEmail

    -- Tags 65 to 164 are not used in this version of the specification

    

    -- In V16.18.0 (threeGPP(4) ts33128(19) r16(16) version16(16)),

    -- tag 65 was mMSConvertedFromEmail (now tag 165) and

    -- tag 66 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V16.19.0 (threeGPP(4) ts33128(19) r16(16) version17(17))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail

}



-- ==============
@@ -175,7 +181,7 @@ IRIEvent ::= CHOICE 
    -- MDF-related events, see clause 7.3.2

    mDFCellSiteReport                                   [16] MDFCellSiteReport,



    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([65-66] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -237,9 +243,15 @@ IRIEvent ::= CHOICE 
    -- PDU to MA PDU session-related events, see clause 6.2.3.2.8

    sMFPDUtoMAPDUSessionModification                    [64] SMFPDUtoMAPDUSessionModification,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [65] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [66] MMSConvertedToEmail 

    -- Tags 65-164 are not used in this version of the specification



    -- In V16.18.0 (threeGPP(4) ts33128(19) r16(16) version16(16)),

    -- tag 65 was mMSConvertedFromEmail (now tag 165) and

    -- tag 66 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V16.19.0 (threeGPP(4) ts33128(19) r16(16) version17(17))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail

}



IRITargetIdentifier ::= SEQUENCE

33128/r17/TS33128Payloads.asn

+70 −11
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version13(13)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r17(17) version14(14)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -9,7 +9,7 @@ BEGIN 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version13(13)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r17(17) version14(14)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -58,7 +58,7 @@ XIRIEvent ::= CHOICE 


    -- tag 16 is reserved because there is no equivalent mDFCellSiteReport in XIRIEvent



    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -197,9 +197,22 @@ XIRIEvent ::= CHOICE 
    -- AMF events, see 6.2.2.2.9, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [134] MMSConvertedToEmail

    -- Tags 133 to 164 are not used in this version of the specification



    -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and

    -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)),

    -- tag 134 was mMSConvertedFromEmail (now tag 165) and

    -- tag 135 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



    -- Tags 167 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation

}



-- ==============
@@ -252,7 +265,7 @@ IRIEvent ::= CHOICE 
    -- MDF-related events, see clause 7.3.2

    mDFCellSiteReport                                   [16] MDFCellSiteReport,



    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([133-134] below)

    -- MMS-related events, see clause 7.4.2 see also MMSConverted events ([165-166] below)

    mMSSend                                             [17] MMSSend,

    mMSSendByNonLocalTarget                             [18] MMSSendByNonLocalTarget,

    mMSNotification                                     [19] MMSNotification,
@@ -390,9 +403,23 @@ IRIEvent ::= CHOICE 
    -- AMF events, see 6.2.2.3, continued from tag 111

    aMFUEConfigurationUpdate                            [132] AMFUEConfigurationUpdate,



    -- MMS-related events continued from choice 35

    mMSConvertedFromEmail                               [133] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [134] MMSConvertedToEmail

    -- Tags 133 to 164 are not used in this version of the specification



    -- In V17.15.0 (threeGPP(4) ts33128(19) r17(17) version12(12)) and

    -- in V17.16.0 (threeGPP(4) ts33128(19) r17(17) version13(13)),

    -- tag 134 was mMSConvertedFromEmail (now tag 165) and

    -- tag 135 was mMSConvertedToEmail (now tag 166).

    -- These fields were renumbered in V17.17.0 (threeGPP(4) ts33128(19) r17(17) version14(14))

    -- to avoid conflict and permit interoperability with newer releases.

    mMSConvertedFromEmail                               [165] MMSConvertedFromEmail,

    mMSConvertedToEmail                                 [166] MMSConvertedToEmail,



    -- Tags 167 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation



}



IRITargetIdentifier ::= SEQUENCE
@@ -3877,6 +3904,17 @@ AMFIdentifierAssociation ::= SEQUENCE 
    additionalUserIdentifiers  [8] UserIdentifiers OPTIONAL

}



AMFIdentifierDeassociation ::= SEQUENCE

{

    sUPI                       [1] SUPI,

    sUCI                       [2] SUCI OPTIONAL,

    pEI                        [3] PEI OPTIONAL,

    gPSI                       [4] GPSI OPTIONAL,

    gUTI                       [5] FiveGGUTI,

    location                   [6] Location OPTIONAL,

    additionalUserIdentifiers  [7] UserIdentifiers OPTIONAL

}



MMEIdentifierAssociation ::= SEQUENCE

{

    iMSI        [1] IMSI,
@@ -3887,6 +3925,15 @@ MMEIdentifierAssociation ::= SEQUENCE 
    tAIList     [6] TAIList OPTIONAL

}



MMEIdentifierDeassociation ::= SEQUENCE

{

    iMSI        [1] IMSI,

    iMEI        [2] IMEI OPTIONAL,

    mSISDN      [3] MSISDN OPTIONAL,

    gUTI        [4] GUTI,

    location    [5] Location OPTIONAL

}



-- =================================

-- Identifier Association parameters

-- =================================
@@ -4416,7 +4463,19 @@ RATType ::= ENUMERATED 
    nRMEO(17),

    nRGEO(18),

    nROTHERSAT(19),

    nRREDCAP(20)

    nRREDCAP(20),

    wBEUTRANLEO(21),

    wBEUTRANMEO(22),

    wBEUTRANGEO(23),

    wBEUTRANOTHERSAT(24),

    nBIOTLEO(25),

    nBIOTMEO(26),

    nBIOTGEO(27),

    nBIOTOTHERSAT(28),

    lTEMLEO(29),

    lTEMMEO(30),

    lTEMGEO(31),

    lTEMOTHERSAT(32)

}



RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI

33128/r18/TS33128Payloads.asn

+89 −6
Original line number Diff line number Diff line 
TS33128Payloads

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version11(11)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r18(18) version12(12)}



DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::=
@@ -18,7 +18,7 @@ IMPORTS 
-- Relative OIDs

-- =============



tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version11(11)}

tS33128PayloadsOID          RELATIVE-OID ::= {threeGPP(4) ts33128(19) r18(18) version12(12)}



xIRIPayloadOID              RELATIVE-OID ::= {tS33128PayloadsOID xIRI(1)}

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -299,7 +299,13 @@ XIRIEvent ::= CHOICE 
    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,



    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel,



    -- Tags 182 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation

}



-- ==============
@@ -582,7 +588,13 @@ IRIEvent ::= CHOICE 
    ePSPDNUnsuccessfulProcedure                         [180] EPSPDNUnsuccessfulProcedure,



    -- IMS events, see clause 7.12.4.2, continued from tag 164

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel

    startOfInterceptionWithEstablishedIMSDataChannel    [181] StartOfInterceptionWithEstablishedIMSDataChannel,



    -- Tags 182 to 185 are not used in this version of the specification



    -- Additional Identifier Association events, see clauses 6.2.2.2.7 and 6.3.2.2.2

    aMFIdentifierDeassociation                          [186] AMFIdentifierDeassociation,

    mMEIdentifierDeassociation                          [187] MMEIdentifierDeassociation

}



IRITargetIdentifier ::= SEQUENCE
@@ -1288,7 +1300,9 @@ UAStarParams ::= CHOICE 
{

    tls12                 [1] TLS12UAStarParams,

    generic               [2] GenericUAStarParams,

    tls13                 [3] TLS13UAStarParams

    tls13                 [3] TLS13UAStarParams,

    dtls12                [4] DTLS12UAStarParams,

    dtls13                [5] DTLS13UAStarParams

}



GenericUAStarParams ::= SEQUENCE
@@ -1344,6 +1358,22 @@ TLS12UAStarParams ::= SEQUENCE 
    tLSClientExtensions   [19] OCTET STRING (SIZE(0..65535)) OPTIONAL

}



-- ==================================================

-- Specific UaStarParams for DTLS 1.2 (RFC6347)

-- Inline references below are to clauses of RFC6347.

-- ==================================================



DTLS12UAStarParams ::= SEQUENCE

{

    tLS12CommonParams [1] TLS12UAStarParams,

    -- RFC 6347 [142] clause 4.1

    clientEpoch       [2] INTEGER,

    -- RFC 6347 [142] clause 4.1

    serverEpoch       [3] INTEGER,

    -- RFC 9146 [143]

    connectionID      [4] OCTET STRING (SIZE(0..255)) OPTIONAL

}



-- ==================================================

-- Specific UaStarParams for TLS 1.3 (RFC8446)

-- Inline references below are to clauses of RFC8446.
@@ -1600,6 +1630,27 @@ TLS13UAStarParams ::= SEQUENCE 
    tLSResumptionTickets            [31] SEQUENCE OF TLS13NewSessionTicket OPTIONAL

}



-- =====================================================

-- Specific UaStarParams for DTLS 1.3 (RFC9147)

-- Inline references below are to clauses of RFC9147.

-- The client/server SnKey can alternatively be

-- derived from information carried in tLS13CommonParams

-- =====================================================



DTLS13UAStarParams ::= SEQUENCE

{

    tLS13CommonParams [1] TLS13UAStarParams,

    -- RFC9147 [144] clause 4.2

    clientEpoch       [2] INTEGER,

    -- RFC9147 [144] clause 4.2

    serverEpoch       [3] INTEGER,

    -- RFC9147 [144] clause 4.2.3

    clientSnKey       [4] OCTET STRING (SIZE(1..65535)) OPTIONAL,

    -- RFC9147 [144] clause 4.2.3

    serverSnKey       [5] OCTET STRING (SIZE(1..65535)) OPTIONAL,

    -- RFC9146 [143]

    connectionID      [6] OCTET STRING (SIZE(0..255)) OPTIONAL

}



KAF ::= OCTET STRING
@@ -5740,6 +5791,17 @@ AMFIdentifierAssociation ::= SEQUENCE 
    additionalUserIdentifiers   [8] UserIdentifiers OPTIONAL

}



AMFIdentifierDeassociation ::= SEQUENCE

{

    sUPI                       [1] SUPI,

    sUCI                       [2] SUCI OPTIONAL,

    pEI                        [3] PEI OPTIONAL,

    gPSI                       [4] GPSI OPTIONAL,

    gUTI                       [5] FiveGGUTI,

    location                   [6] Location OPTIONAL,

    additionalUserIdentifiers  [7] UserIdentifiers OPTIONAL

}



MMEIdentifierAssociation ::= SEQUENCE

{

    iMSI        [1] IMSI,
@@ -5749,6 +5811,14 @@ MMEIdentifierAssociation ::= SEQUENCE 
    location    [5] Location,

    tAIList     [6] TAIList OPTIONAL

}

MMEIdentifierDeassociation ::= SEQUENCE

{

    iMSI        [1] IMSI,

    iMEI        [2] IMEI OPTIONAL,

    mSISDN      [3] MSISDN OPTIONAL,

    gUTI        [4] GUTI,

    location    [5] Location OPTIONAL

}



-- =================================

-- Identifier Association parameters
@@ -6741,7 +6811,20 @@ RATType ::= ENUMERATED 
    nRMEO(17),

    nRGEO(18),

    nROTHERSAT(19),

    nRREDCAP(20)

    nRREDCAP(20),

    wBEUTRANLEO(21),

    wBEUTRANMEO(22),

    wBEUTRANGEO(23),

    wBEUTRANOTHERSAT(24),

    nBIOTLEO(25),

    nBIOTMEO(26),

    nBIOTGEO(27),

    nBIOTOTHERSAT(28),

    lTEMLEO(29),

    lTEMMEO(30),

    lTEMGEO(31),

    lTEMOTHERSAT(32),

    nREREDCAP(33)

}



RejectedNSSAI ::= SEQUENCE OF RejectedSNSSAI

33128/r19/TS33128Payloads.asn

+287 −7

File changed.

Preview size limit exceeded, changes collapsed.

33128/r19/urn_3GPP_ns_li_3GPPX1Extensions.xsd

+36 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r19:v1" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r19:v1" elementFormDefault="qualified">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="urn:3GPP:ns:li:3GPPX1Extensions:r19:v2" xmlns:common="http://uri.etsi.org/03280/common/2017/07" xmlns:x1="http://uri.etsi.org/03221/X1/2017/10" targetNamespace="urn:3GPP:ns:li:3GPPX1Extensions:r19:v2" elementFormDefault="qualified">



  <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

  <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10"/>
@@ -85,6 +85,27 @@ 
    </xs:restriction>

  </xs:simpleType>



<xs:element name="PINLIX1TargetIdentifier" type="PINLIX1TargetIdentifier"/>

<xs:complexType name="PINLIX1TargetIdentifier">

    <xs:choice>

      <xs:element name="PINClientID" type="PINClientID"/>

      <xs:element name="IdentityToken" type="IdentityToken"/>

      <xs:element name="PINID" type="PINID"/>

    </xs:choice>

  </xs:complexType>



  <xs:simpleType name="PINClientID">

    <xs:restriction base="xs:string"/>

  </xs:simpleType>



  <xs:simpleType name="IdentityToken">

    <xs:restriction base="xs:string"/>

  </xs:simpleType>



  <xs:simpleType name="PINID">

    <xs:restriction base="xs:string"/>

  </xs:simpleType>



  <xs:element name="IdentifierAssociationExtensions" type="IdentifierAssociationExtensions"/>



  <xs:complexType name="X1Extension">
@@ -97,6 +118,7 @@ 
      <xs:element name="SDP" type="SDP"/>

      <xs:element name="STIRSHAKENProvisioning" type="STIRSHAKENTargetProvisioningExtensions"/>

      <xs:element name="LocationOnlyProvisioning" type="LocationOnlyProvisioningExtensions"/>

      <xs:element name="ChargingDataEvents" type="ChargingDataEventsExtensions"/>

    </xs:choice>

  </xs:complexType>
@@ -402,4 +424,17 @@ 
    </xs:sequence>

  </xs:complexType>



  <xs:complexType name="ChargingDataEventsExtensions">

    <xs:sequence>

      <xs:element name="ChargingDataEventsGenerated" type="ChargingDataEventsGenerated"/>

    </xs:sequence>

  </xs:complexType>



  <xs:simpleType name="ChargingDataEventsGenerated">

    <xs:restriction base="xs:string">

      <xs:enumeration value="DefaultChargingDataInformation"/>

      <xs:enumeration value="TranslatedChargingDataInformation"/>

    </xs:restriction>

  </xs:simpleType>



</xs:schema>