Commit 2c7b32cc authored by mewburn's avatar mewburn
Browse files

bump OIDs for imports from TS 101 671

Update HI1NotificationOperations to version8(8)
Update HI2Operations to version19(19)
Add comments describing the heritage of both modules.
parent df323c1e
Loading
Loading
Loading
Loading
+8 −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 previously provided by TS 101 671 [4]
-- (which is now historical).
-- This ASN.1 module has been copied to TS 102 232-1 (the present document).
-- It is not recommended to use or extend this module in future change requests.

DEFINITIONS IMPLICIT TAGS ::=
BEGIN
@@ -9,7 +14,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 +25,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
{
+9 −4
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 previously provided by TS 101 671 [4]
-- (which is now historical).
-- This ASN.1 module has been copied to TS 102 232-1 (the present document).
-- It is not recommended to 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 +44,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
{
+2 −2
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ IMPORTS
    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]
    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,