Commit 7c349ccd authored by canterburym's avatar canterburym
Browse files

Merge branch 'meeting/SA102' into 'main' 

Output from SA#102

See merge request !208
parents 228843ce b88449b3

33128/r15/TS33128Payloads.asn

+23 −9
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) r15(15) version5(5)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19) r15(15) version6(6)}



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

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



xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version5(5) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version5(5) xCC(2)}

xIRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xIRI(1)}

xCCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) xCC(2)}



iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version5(5) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version5(5) cC(4)}

iRIPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) iRI(3)}

cCPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) cC(4)}



lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version5(5) lINotification(5)}

lINotificationPayloadOID RELATIVE-OID ::= {threeGPP(4) ts33128(19) r15(15) version6(6) lINotification(5)}



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

-- X2 xIRI payload
@@ -665,6 +665,9 @@ GUMMEI ::= SEQUENCE 
    mNC         [3] MNC

}



HomeNetworkIdentifier ::= UTF8String



-- This parameter shall be encoded as an octet string as a single octet containing the Home Network Public ID.

HomeNetworkPublicKeyID ::= OCTET STRING



HSMFURI ::= UTF8String
@@ -790,9 +793,18 @@ SUCI ::= SEQUENCE 
    protectionSchemeID          [4] ProtectionSchemeID,

    homeNetworkPublicKeyID      [5] HomeNetworkPublicKeyID,

    schemeOutput                [6] SchemeOutput,

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL

    -- shall be included if different from the number of meaningful digits given

    -- in routingIndicator

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL,

    -- the sUPIType and homeNetworkIdentifier fields are OPTIONAL to support reporting SUCIs in

    -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0

    -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0

    sUPIType                    [8] SUPIType OPTIONAL,

    -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported 

    -- as the MCC and MNC above

    -- if the sUPIType is not '0' the mCC and mNC fields above 

    -- shall be populated with '000' and ignored by the receiver.

    homeNetworkIdentifier       [9] HomeNetworkIdentifier OPTIONAL

}



SUPI ::= CHOICE
@@ -801,6 +813,8 @@ SUPI ::= CHOICE 
    nAI         [2] NAI

}



SUPIType ::= INTEGER (0..7)



SUPIUnauthenticatedIndication ::= BOOLEAN



TargetIdentifier ::= CHOICE

33128/r16/TS33128Payloads.asn

+17 −5
Original line number Diff line number Diff line 
TS33128Payloads

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

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



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

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



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

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -2135,6 +2135,9 @@ GUMMEI ::= SEQUENCE 
    mNC         [3] MNC

}



HomeNetworkIdentifier ::= UTF8String



-- This parameter shall be encoded as an octet string as a single octet containing the Home Network Public ID.

HomeNetworkPublicKeyID ::= OCTET STRING



HSMFURI ::= UTF8String
@@ -2289,9 +2292,16 @@ SUCI ::= SEQUENCE 
    protectionSchemeID          [4] ProtectionSchemeID,

    homeNetworkPublicKeyID      [5] HomeNetworkPublicKeyID,

    schemeOutput                [6] SchemeOutput,

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL

      -- shall be included if different from the number of

      -- meaningful digits given in routingIndicator

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL,

    -- the sUPIType and homeNetworkIdentifier fields are OPTIONAL to support reporting SUCIs in

    -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0

    -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0

    sUPIType                    [8] SUPIType OPTIONAL,

    -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported 

    -- as the MCC and MNC above

    -- if the sUPIType is not '0' the mCC and mNC fields above 

    -- shall be populated with '000' and ignored by the receiver.

    homeNetworkIdentifier       [9] HomeNetworkIdentifier OPTIONAL

}



SUPI ::= CHOICE
@@ -2300,6 +2310,8 @@ SUPI ::= CHOICE 
    nAI         [2] NAI

}



SUPIType ::= INTEGER (0..7)



SUPIUnauthenticatedIndication ::= BOOLEAN



TargetIdentifier ::= CHOICE

33128/r17/TS33128Payloads.asn

+21 −7
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) version9(9)}

{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) version9(9)}

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



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

xCCPayloadOID               RELATIVE-OID ::= {tS33128PayloadsOID xCC(2)}
@@ -517,7 +517,8 @@ NEFPDUSessionModification ::= SEQUENCE 
    applicationID                [7] ApplicationID OPTIONAL,

    aFID                         [8] AFID OPTIONAL,

    rDSAction                    [9] RDSAction OPTIONAL,

    serializationFormat          [10] SerializationFormat OPTIONAL

    serializationFormat          [10] SerializationFormat OPTIONAL,

    pDUSessionID                 [11] PDUSessionID OPTIONAL

}



-- See clause 7.7.2.1.4 for details of this structure
@@ -799,7 +800,8 @@ SCEFPDNConnectionUpdate ::= SEQUENCE 
    applicationID                [7] ApplicationID OPTIONAL,

    sCSASID                      [8] SCSASID OPTIONAL,

    rDSAction                    [9] RDSAction OPTIONAL,

    serializationFormat          [10] SerializationFormat OPTIONAL

    serializationFormat          [10] SerializationFormat OPTIONAL,

    ePSBearerID                  [11] EPSBearerID OPTIONAL

}



-- See clause 7.8.2.1.4 for details of this structure
@@ -4195,6 +4197,9 @@ GUTI ::= SEQUENCE 
    mTMSI        [5] TMSI

}



HomeNetworkIdentifier ::= UTF8String



-- This parameter shall be encoded as an octet string as a single octet containing the Home Network Public ID.

HomeNetworkPublicKeyID ::= OCTET STRING



HSMFURI ::= UTF8String
@@ -4414,9 +4419,16 @@ SUCI ::= SEQUENCE 
    protectionSchemeID          [4] ProtectionSchemeID,

    homeNetworkPublicKeyID      [5] HomeNetworkPublicKeyID,

    schemeOutput                [6] SchemeOutput,

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL

       -- shall be included if different from the number of meaningful digits given

       -- in routingIndicator

    routingIndicatorLength      [7] INTEGER (1..4) OPTIONAL,

    -- the sUPIType and homeNetworkIdentifier fields are OPTIONAL to support reporting SUCIs in

    -- the format defined in 23.003 [19] version 15.0.0 to 15.4.0

    -- to report SUCIs in the format defined in 23.003 [19] version 15.0.0

    sUPIType                    [8] SUPIType OPTIONAL,

    -- if the sUPIType is '0' the homeNetworkIdentifier is the PLMN and may be absent as it is reported 

    -- as the MCC and MNC above

    -- if the sUPIType is not '0' the mCC and mNC fields above 

    -- shall be populated with '000' and ignored by the receiver.

    homeNetworkIdentifier       [9] HomeNetworkIdentifier OPTIONAL

}



SUPI ::= CHOICE
@@ -4425,6 +4437,8 @@ SUPI ::= CHOICE 
    nAI         [2] NAI

}



SUPIType ::= INTEGER (0..7)



SUPIUnauthenticatedIndication ::= BOOLEAN



SwitchOffIndicator ::= ENUMERATED

33128/r18/TS33128Payloads.asn

+412 −122

File changed.

Preview size limit exceeded, changes collapsed.

33128/r17/urn_3GPP_ns_li_3GPPIdentityExtensions.xsd

+2 −2

File changed.

Contains only whitespace changes.