Commit 0d26bdf5 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updating OIDs, namespaces, regnerating JSON

parent ffe0325a

102232-1/LI-PS-PDU.asn

+2 −2
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) version37(37)}

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



DEFINITIONS IMPLICIT TAGS ::=
@@ -206,7 +206,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) version37(37)}

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



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

-- 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) version17(17)}

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



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) version37(37)};

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





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

-- Object Identifier Definition

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



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

iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version18(18)}

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

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

iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId 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) version30(30)}

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



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) version30(30)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version31(31)}



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

-- Top level definitions for RDHI wrapper

102657/RDMessage.xsd

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.3.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.3.1#/RetainedData" elementFormDefault="qualified">

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.4.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.3.1#/RetainedData" elementFormDefault="qualified">

    <xsd:annotation>

        <xsd:documentation xml:lang="en">

            XSD translated from ASN.1 derived from outcome of TS 102 657 v2.3.1

            XSD translated from ASN.1 derived from outcome of TS 102 657 v2.4.1

        </xsd:documentation>

    </xsd:annotation>

    <xsd:simpleType name="GeneralizedTime">

103221-1/TS_103_221_01.xsd

+1 −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="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.17.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.18.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 -->