Commit 05ce1caf authored by mewburn's avatar mewburn Committed by Mark Canterbury
Browse files

TS 102 232-1 CR0107 Update OIDs for TS 101 671 files 

Update HI1NotificationOperations to version8(8)
Update HI2Operations to version19(19)
Add comments describing the history of both modules, and advise against further changes.

Clarify in the LI-PS-PDU comments that the HI1NotificationOperations
and HI2Operations modules are now provided with TS 102 232-1,
and not with TS 101 671 (historical).
parent 1078bcee

102232-1/HI1NotificationOperations.asn

+13 −3
Original line number Diff line number Diff line 
HI1NotificationOperations

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version8(8)}



-- Prior to version8(8), this ASN.1 module was provided by TS 101 671 [4],

-- which was marked as historical in V3.15.1 (2018-06).

--

-- This ASN.1 module has been copied from TS 101 671 V3.15.1 [4] to

-- TS 102 232-1 (the present document) to assist implementors of LI-PS-PDU.

-- The ASN.1 in this module shall be equivalent to that in TS 101 671 [4]

-- so that the ASN.1 encodes identically, except for hi1OperationId.

--

-- It is not recommended to use or extend this module in future change requests.



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,7 +19,7 @@ IMPORTS 
    TimeStamp,

    LawfulInterceptionIdentifier

        FROM HI2Operations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version10(10)};

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version19(19)};



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

-- Object Identifier Definitions
@@ -20,7 +30,7 @@ lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization( 


-- hi1 Domain

hi1NotificationOperationsId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId hi1(0) notificationOperations(1)}

hi1OperationId OBJECT IDENTIFIER ::= {hi1NotificationOperationsId version6(6)}

hi1OperationId OBJECT IDENTIFIER ::= {hi1NotificationOperationsId version8(8)}



HI1-Operation   ::= CHOICE

{

102232-1/HI2Operations.asn

+15 −5
Original line number Diff line number Diff line 
HI2Operations

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(18)}



{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version19(19)}



-- Prior to version19(19), this ASN.1 module was provided by TS 101 671 [4],

-- which was marked as historical in V3.15.1 (2018-06).

--

-- This ASN.1 module has been copied from TS 101 671 V3.15.1 [4] to

-- TS 102 232-1 (the present document) to assist implementors of LI-PS-PDU.

-- The ASN.1 in this module shall be equivalent to that in TS 101 671 [4]

-- so that the ASN.1 encodes identically, except for hi2OperationId.

--

-- It is not recommended to use or extend this module in future change requests.

--

-- It is advised not to use version11(11) of this ASN.1 module since it contains a syntax error.

-- Version11(11) of HI2Operations is only defined in TS 101 671 v3.5.1 [4].
@@ -39,7 +49,7 @@ lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization( 


-- Security Subdomains

hi2DomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId hi2(1)}

hi2OperationId OBJECT IDENTIFIER ::= {hi2DomainId version18(18)}

hi2OperationId OBJECT IDENTIFIER ::= {hi2DomainId version19(19)}



IRIsContent ::= CHOICE

{

102232-1/LI-PS-PDU.asn

+5 −5
Original line number Diff line number Diff line
@@ -14,18 +14,18 @@ IMPORTS 
        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)}





    -- from ETSI TS 101 671 [4]

    -- previously from ETSI TS 101 671 [4]; now provided with this specification

    IRI-Parameters,

    IRIsContent,

    Location,

    Network-Element-Identifier

        FROM HI2Operations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version19(19)}



    -- from ETSI TS 101 671 [4]

    -- previously from ETSI TS 101 671 [4]; now provided with this specification

    HI1-Operation

        FROM HI1NotificationOperations

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version8(8)}



    -- from ETSI TS 102 232-2 [5]

    EmailCC,
@@ -249,7 +249,7 @@ Payload ::= CHOICE 
    hI1-Operation           [3] HI1NotificationOperations.HI1-Operation,

    encryptionContainer     [4] EncryptionContainer,

    threeGPP-HI1-Operation  [5] ThreeGPP-HI1NotificationOperations.ThreeGPP-HI1-Operation,

        -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4]

        -- This structure may be functionally redundant with hI1-Operation previously from ETSI TS 101 671 [4]

    iLHIPayload             [6] SEQUENCE OF ILHIPDU.ILHIPayload,

        -- For typical use cases see ETSI TS 103 462 [45]

    hI4Payload              [7] SEQUENCE OF HI4Payload