Merge branch 'meeting/LI68' into 'main' (8080aefc) · Commits · LI - Lawful Interception / TC LI schemas definitions

102232-1/LI-PS-PDU.asn

+19 −11

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) version38(38)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version39(39)}

		DEFINITIONS IMPLICIT TAGS ::=

		@@ -9,9 +9,10 @@ IMPORTS
		-- Any of the IMPORTs may be commented out if they are not used (see clause A.3)

		-- from ETSI TS 103 280 [44]
		LIID
		LIID,
		WGS84CoordinateDecimal
		FROM Common-Parameters
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version251(251)}
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version261(261)}


		-- previously from ETSI TS 101 671 [4]; now provided with this specification
		@@ -42,7 +43,7 @@ IMPORTS
		IPIRIOnly,
		IPIRIPacketReport
		FROM 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) version19(19)}

		-- from ETSI TS 102 232-4 [32]
		L2CC,
		@@ -55,7 +56,7 @@ IMPORTS
		IPMMCC,
		IPMMIRI
		FROM IPMultimediaPDU
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version16(16)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version17(17)}

		-- from ETSI TS 102 232-6 [36]
		PstnIsdnCC,
		@@ -206,7 +207,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) version38(38)}
		li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version39(39)}

		-- ====================
		-- Top-level definition
		@@ -683,7 +684,8 @@ Location ::= SEQUENCE
		...,
		wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL,
		eTSI671HI2Location [3] HI2Operations.Location OPTIONAL,
		threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL
		threeGPP33128UserLocation [4] TS33128Payloads.UserLocation OPTIONAL,
		cPEProvidedLocationAttributes [5] CPEProvidedLocationAttributes OPTIONAL
		}

		WlanLocationAttributes ::= SEQUENCE
		@@ -693,6 +695,12 @@ WlanLocationAttributes ::= SEQUENCE
		...
		}

		CPEProvidedLocationAttributes ::= SEQUENCE
		{
		wGS84CoordinateDecimal [0] Common-Parameters.WGS84CoordinateDecimal OPTIONAL,
		...
		}

		IPAddress ::= SEQUENCE
		-- This parameter was previously imported from ETSI TS 101 671 [4] but has been copied
		-- to ETSI TS 102 232-1 (the present document). It is not recommended to use this parameter in

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) version18(18)}
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version19(19)}

		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) version38(38)};
		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version39(39)};


		-- ============================
		-- Object Identifier Definition
		-- ============================

		iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version18(18)}
		iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version19(19)}
		iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)}
		iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)}
		iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)}

102657/RDMessage.asn

+31 −17

Original line number	Diff line number	Diff line
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version31(31)}
		RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version32(32)}

		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) version31(31)}
		rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version32(32)}

		-- ======================================
		-- Top level definitions for RDHI wrapper
		@@ -793,7 +793,9 @@ BillingRecords ::= SEQUENCE
		transactionStatus [8] UTF8String OPTIONAL,
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national bases
		copyOfBill [9] SEQUENCE OF File OPTIONAL
		copyOfBill [9] SEQUENCE OF File OPTIONAL,
		cryptocurrency [10] DigitalTokenIdentifier OPTIONAL
		-- Cryptocurrency of payment as per ISO 24165-2 [57]
		}


		@@ -1799,9 +1801,11 @@ MsgBillingRecords ::= SEQUENCE
		msgTransactionID [7] UTF8String OPTIONAL,
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
		mgsTransactionStatus [8] UTF8String OPTIONAL
		mgsTransactionStatus [8] UTF8String OPTIONAL,
		-- Status of the transaction (i.e. "declined", "succeeded" etc.)
		-- Details to be defined on a national bases
		cryptocurrency [9] DigitalTokenIdentifier OPTIONAL
		-- Cryptocurrency of payment as per ISO 24165-2 [57]
		}

		NationalMsgBillingRecords ::= SEQUENCE
		@@ -2191,9 +2195,11 @@ MultimediaBillingRecords ::= SEQUENCE
		multimediaTransactionID [7] UTF8String OPTIONAL,
		-- Unique reference for this transaction/billing record
		-- Details to be defined on a national basis
		multimediaTransactionStatus [8] UTF8String OPTIONAL
		multimediaTransactionStatus [8] UTF8String OPTIONAL,
		-- Status of the transaction (i.e. "declined", "succeeded", etc.)
		-- Details to be defined on a national bases
		cryptocurrency [9] DigitalTokenIdentifier OPTIONAL
		-- Cryptocurrency of payment as per ISO 24165-2 [57]
		}

		NationalMultimediaBillingRecords ::= SEQUENCE
		@@ -2449,29 +2455,37 @@ EdgeComputingApplicationBillingRecords ::= SEQUENCE

		DigitalTokenIdentifier ::= SEQUENCE
		{
		baseRecord [1] BaseRecord,
		forkRecord [2] ForkRecord,
		informativeDataElements [3] InformativeDataElements,
		baseRecord [1] BaseRecord OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		forkRecord [2] ForkRecord OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		informativeDataElements [3] InformativeDataElements OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		...
		}

		BaseRecord ::= OCTET STRING

		ForkRecord ::= OCTET STRING

		InformativeDataElements ::= SEQUENCE
		{
		digitalTokenName [1] DigitalTokenName,
		tokenIdentifierType [2] TokenIdentifierType,
		dTIRegistrationAuthorityIdentifier [3] DTIRegistrationAuthorityIdentifier,
		otherDataElements [4] OtherDataElements,
		digitalTokenName [1] DigitalTokenName OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		tokenIdentifierType [2] TokenIdentifierType OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		dTIRegistrationAuthorityIdentifier [3] DTIRegistrationAuthorityIdentifier OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		otherDataElements [4] OtherDataElements OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		...
		}

		DigitalTokenName::= SEQUENCE
		{
		digitalTokenLongName [1] DigitalTokenLongName,
		digitalTokenShortName [2] DigitalTokenShortName,
		digitalTokenLongName [1] DigitalTokenLongName OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		digitalTokenShortName [2] DigitalTokenShortName OPTIONAL,
		-- NOTE - as of v2.5.1, this field has been changed from mandatory to optional.
		...
		}

		@@ -2493,8 +2507,8 @@ DigitalTokenShortName ::= SEQUENCE

		TokenIdentifierType ::= SEQUENCE
		{
		digitalTokenIdentifierType [1] DigitalTokenIdentifierType,
		digitalLedgerTechnologyType [2] DigitalLedgerTechnologyType,
		digitalTokenIdentifierType [1] DigitalTokenIdentifierType OPTIONAL,
		digitalLedgerTechnologyType [2] DigitalLedgerTechnologyType OPTIONAL,
		...
		}

102657/RDMessage.xsd

+16 −13

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.4.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.4.1#/RetainedData" elementFormDefault="qualified">
		<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.5.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.5.1#/RetainedData" elementFormDefault="qualified">
		<xsd:annotation>
		<xsd:documentation xml:lang="en">
		XSD translated from ASN.1 derived from outcome of TS 102 657 v2.4.1
		XSD translated from ASN.1 derived from outcome of TS 102 657 v2.5.1
		</xsd:documentation>
		</xsd:annotation>
		<xsd:simpleType name="GeneralizedTime">
		@@ -871,6 +871,7 @@
		</xsd:sequence>
		</xsd:complexType>
		</xsd:element>
		<xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -1880,6 +1881,7 @@
		<xsd:element name="nationalMsgBillingRecords" type="NationalMsgBillingRecords" minOccurs="0"/>
		<xsd:element name="msgTransactionID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="msgTransactionStatus" type="xsd:string" minOccurs="0"/>
		<xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -3137,6 +3139,7 @@
		<xsd:element name="nationalMultimediaBillingRecords" type="NationalMultimediaBillingRecords" minOccurs="0"/>
		<xsd:element name="multimediaTransactionID" type="xsd:string" minOccurs="0"/>
		<xsd:element name="multimediaTransactionStatus" type="xsd:string" minOccurs="0"/>
		<xsd:element name="cryptocurrency" type="DigitalTokenIdentifier" minOccurs="0"/>
		<xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		@@ -3537,9 +3540,9 @@
		</xsd:simpleType>
		<xsd:complexType name="DigitalTokenIdentifier">
		<xsd:sequence>
		<xsd:element name="baseRecord" type="BaseRecord"/>
		<xsd:element name="forkRecord" type="ForkRecord"/>
		<xsd:element name="informativeDataElements" type="InformativeDataElements"/>
		<xsd:element name="baseRecord" type="BaseRecord" minOccurs="0"/>
		<xsd:element name="forkRecord" type="ForkRecord" minOccurs="0"/>
		<xsd:element name="informativeDataElements" type="InformativeDataElements" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:simpleType name="BaseRecord">
		@@ -3550,16 +3553,16 @@
		</xsd:simpleType>
		<xsd:complexType name="InformativeDataElements">
		<xsd:sequence>
		<xsd:element name="digitalTokenName" type="DigitalTokenName"/>
		<xsd:element name="tokenIdentifierType" type="TokenIdentifierType"/>
		<xsd:element name="dTIRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier"/>
		<xsd:element name="otherDataElements" type="OtherDataElements"/>
		<xsd:element name="digitalTokenName" type="DigitalTokenName" minOccurs="0"/>
		<xsd:element name="tokenIdentifierType" type="TokenIdentifierType" minOccurs="0"/>
		<xsd:element name="dTIRegistrationAuthorityIdentifier" type="DTIRegistrationAuthorityIdentifier" minOccurs="0"/>
		<xsd:element name="otherDataElements" type="OtherDataElements" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenName">
		<xsd:sequence>
		<xsd:element name="digitalTokenLongName" type="DigitalTokenLongName"/>
		<xsd:element name="digitalTokenShortName" type="DigitalTokenShortName"/>
		<xsd:element name="digitalTokenLongName" type="DigitalTokenLongName" minOccurs="0"/>
		<xsd:element name="digitalTokenShortName" type="DigitalTokenShortName" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenLongName">
		@@ -3576,8 +3579,8 @@
		</xsd:complexType>
		<xsd:complexType name="TokenIdentifierType">
		<xsd:sequence>
		<xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType"/>
		<xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType"/>
		<xsd:element name="digitalTokenIdentifierType" type="DigitalTokenIdentifierType" minOccurs="0"/>
		<xsd:element name="digitalLedgerTechnologyType" type="DigitalLedgerTechnologyType" minOccurs="0"/>
		</xsd:sequence>
		</xsd:complexType>
		<xsd:complexType name="DigitalTokenIdentifierType">

103120/dictionaries/ts_103120_Dictionaries.schema.json

0 → 100644

+69 −0

Original line number	Diff line number	Diff line
		{
		"$id": "ts_103280_Dictionaries_2019_10",
		"$schema": "https://json-schema.org/draft/2020-12/schema",
		"$defs": {
		"Dictionaries": {
		"type": "object",
		"properties": {
		"dictionaries:Dictionary": {
		"type": "array",
		"items": {
		"$ref": "#/$defs/Dictionary"
		}
		}
		},
		"required": [],
		"additionalProperties": false
		},
		"Dictionary": {
		"type": "object",
		"properties": {
		"dictionaries:Owner": {
		"type": "string"
		},
		"dictionaries:Name": {
		"type": "string"
		},
		"dictionaries:DictionaryEntries": {
		"$ref": "#/$defs/DictionaryEntries"
		}
		},
		"required": [
		"dictionaries:Owner",
		"dictionaries:Name",
		"dictionaries:DictionaryEntries"
		],
		"additionalProperties": false
		},
		"DictionaryEntries": {
		"type": "object",
		"properties": {
		"dictionaries:DictionaryEntry": {
		"type": "array",
		"items": {
		"$ref": "#/$defs/DictionaryEntry"
		}
		}
		},
		"required": [],
		"additionalProperties": false
		},
		"DictionaryEntry": {
		"type": "object",
		"properties": {
		"dictionaries:Value": {
		"type": "string"
		},
		"dictionaries:Meaning": {
		"type": "string"
		}
		},
		"required": [
		"dictionaries:Value",
		"dictionaries:Meaning"
		],
		"additionalProperties": false
		}
		},
		"$ref": "#/$defs/Dictionaries"
		}

Admin message