Merge branch 'cr/102232-1/124' into 'meeting/LI73' (23188cdf) · Commits · LI - Lawful Interception / TC LI schemas definitions

102232-1/LI-PS-PDU.asn

+61 −4

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

		-- from ETSI TS 103 280 [44]
		GNSSLocation,
		LIID,
		WGS84CoordinateDecimal,
		GNSSLocation
		LongString,
		ShortString,
		WGS84CoordinateDecimal
		FROM Common-Parameters
		{itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}

		@@ -269,7 +271,8 @@ TimeStampQualifier ::= ENUMERATED
		HI4Payload ::= CHOICE
		{
		threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload,
		...
		...,
		hi4Notification [2] HI4Notification
		}

		-- ====================================
		@@ -478,7 +481,6 @@ GcseIRI ::= CHOICE
		...
		}


		-- ===========================
		-- Definitions for TRI Payload
		-- ===========================
		@@ -671,6 +673,61 @@ EncryptedPayloadType ::= ENUMERATED
		-- encrypted payload is ETSI TS 102 232-1 (the present document)
		}

		-- =================================
		-- Definitions for HI4 notifications
		-- =================================

		HI4Notification ::= CHOICE
		{
		liActivated [1] HI4LINotification,
		liDeactivated [2] HI4LINotification,
		liModified [3] HI4LINotification,
		...
		}

		HI4LINotification ::= SEQUENCE
		{
		activationTime [1] GeneralizedTime OPTIONAL,
		deactivationTime [2] GeneralizedTime OPTIONAL,
		targetIdentifiers [3] SEQUENCE OF TargetIdentifier OPTIONAL,
		serviceType [4] DictionaryEntry OPTIONAL,
		targetIdentifierSubtype [5] DictionaryEntry OPTIONAL,
		interceptType [6] InterceptType OPTIONAL,
		ownerIdentifier [7] Common-Parameters.ShortString OPTIONAL,
		authorizationReference [8] Common-Parameters.LongString OPTIONAL,
		...
		}

		TargetIdentifier ::= CHOICE
		{
		targetIdentifierFormat [1] TargetIdentifierFormat,
		...
		}

		TargetIdentifierFormat ::= SEQUENCE
		{
		formatOwner [1] Common-Parameters.ShortString,
		formatName [2] Common-Parameters.ShortString,
		targetValue [3] Common-Parameters.LongString,
		...
		}

		InterceptType ::= ENUMERATED
		{
		iriAndCc(1),
		iriOnly(2),
		ccOnly(3),
		...
		}

		DictionaryEntry ::= SEQUENCE
		{
		owner [1] Common-Parameters.ShortString,
		name [2] Common-Parameters.ShortString,
		value [3] Common-Parameters.ShortString,
		...
		}

		-- ===================================
		-- Common Parameters
		-- ===================================

103280/TS_103_280.asn1

+4 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,10 @@ DEFINITIONS IMPLICIT TAGS EXTENSIBILITY IMPLIED ::= BEGIN

		commonParameterDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version271(271)}

		-- XXX Temporary stubs for TS 102 232-1 CR 124. Remove once MR !328 for TS 103 280 CR 042 is merged.
		ShortString ::= NULL
		LongString ::= NULL

		-- Common Parameters (below are as defined in clause 6)

		LIID ::= OCTET STRING (SIZE (1..25))