Commit eb8d90db authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Bumping version numbers and OIDs

parent e8bf7a8c

102232-1/LI-PS-PDU.asn

+5 −5
Original line number Diff line number Diff line 
LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -11,7 +11,7 @@ IMPORTS 
    -- from ETSI TS 103 280 [44]

    LIID

        FROM Common-Parameters

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version241(241)}

        {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}





    -- previously from ETSI TS 101 671 [4]; now provided with this specification
@@ -41,14 +41,14 @@ IMPORTS 
    IPIRI,

    IPIRIOnly

        FROM IPAccessPDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}



    -- from ETSI TS 102 232-4 [32]

    L2CC,

    L2IRI,

    L2IRIOnly

        FROM L2AccessPDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version8(8)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) l2Access(4) version9(9)}



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

    IPMMCC,
@@ -205,7 +205,7 @@ IMPORTS 


lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)}



li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version36(36)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version37(37)}



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

-- Top-level definition

102232-3/IPAccessPDU.asn

+3 −3
Original line number Diff line number Diff line 
IPAccessPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version16(16)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,14 +9,14 @@ IMPORTS 
    IPAddress,

    Location

        FROM LI-PS-PDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version36(36)};

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)};





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

-- Object Identifier Definition

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



iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version16(16)}

iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version17(17)}

iPIRIObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRI(1)}

iPCCObjId RELATIVE-OID                      ::= {iPAccessPDUObjId cC(2)}

iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId iRIOnly(3)}

102232-4/L2AccessPDU.asn

+2 −2
Original line number Diff line number Diff line 
L2AccessPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)

li-ps(5) l2Access(4) version8(8)}

li-ps(5) l2Access(4) version9(9)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,7 +9,7 @@ BEGIN 
-- Object Identifier Definition

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



l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version8(8)}

l2AccessPDUObjId RELATIVE-OID   ::= {li-ps(5) l2Access(4) version9(9)}

l2IRIObjId RELATIVE-OID         ::= {l2AccessPDUObjId iRI(1)}

l2CCObjId RELATIVE-OID          ::= {l2AccessPDUObjId cC(2)}

l2IRIOnlyObjId RELATIVE-OID     ::= {l2AccessPDUObjId iRIOnly(3)}

102657/RDMessage.asn

+2 −2
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version28(28)}

RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version29(29)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -12,7 +12,7 @@ BEGIN 
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}



-- rdHeader

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version28(28)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version29(29)}



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

-- Top level definitions for RDHI wrapper

103221-1/TS_103_221_01.xsd

+2 −2
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="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.15.1">

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/03221/X1/2017/10" xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns:hashedID="http://uri.etsi.org/03221/X1/2017/10/HashedID" xmlns:destinationSet="http://uri.etsi.org/03221/X1/2017/10/DestinationSet" targetNamespace="http://uri.etsi.org/03221/X1/2017/10" elementFormDefault="qualified" version="1.16.1">

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

    <xs:import namespace="http://uri.etsi.org/03221/X1/2017/10/HashedID"/>

    <!-- Message containers -->