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

TS 102 232-1 v3.13.1 (2017-03-22) agreed at LI#44 (Sophia-Antipolis, 2017-01-30)

parent 427036b2

102232-1/LI-PS-PDU.asn

+63 −48
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) version24(24)}

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



DEFINITIONS IMPLICIT TAGS ::=
@@ -14,7 +14,7 @@ IMPORTS 
	IRIsContent,

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



	-- from TS 101 671 [4]

	HI1-Operation
@@ -55,7 +55,6 @@ IMPORTS 
	PstnIsdnIRI

		FROM PstnIsdnPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}



	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsIRIsContent,
@@ -101,7 +100,7 @@ IMPORTS 


	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	GCSEIRIsContent

	GcseIRIsContent

		FROM GCSEHI2Operations

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)}

			-- The relevant module (including the 3GPP release and version number) needs
@@ -110,14 +109,14 @@ IMPORTS 
	-- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Umts-HI3-PS

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

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)}

            -- The relevant module (including the 3GPP  release and version number)

            -- needs to be chosen when compiling the application.



    -- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Eps-HI3-PS

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}

            -- The relevant module (including the 3GPP  release and version number)

            -- needs to be chosen when compiling the application.
@@ -151,8 +150,7 @@ IMPORTS 
			-- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are

			-- corresponding to different implementations and exclusive usage each other.

			-- The implementation depends of national regulations or LEA/CSP negotiations.

			-- 3GPP HI1 may be used with other services/networks than 3GPP’s one.



			-- 3GPP HI1 may be used with other services/networks than 3GPP's one.



	-- from TS 101 909-20-1 [33]

	TARGETACTIVITYMONITOR-1,
@@ -187,7 +185,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) version24(24)}

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



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

-- Top-level definition
@@ -227,7 +225,6 @@ Payload ::= CHOICE 
	encryptionContainer		[4] EncryptionContainer,

	threeGPP-HI1-Operation	[5] ThreeGPP-HI1-Operation

		-- This structure may be functionally redundant with hI1-Operation from TS 101 671



}



TimeStampQualifier ::= ENUMERATED
@@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE 
	networkIdentifier				[0] NetworkIdentifier,

	communicationIdentityNumber		[1] INTEGER (0..4294967295) OPTIONAL,

		-- in case of transport of HI1 messages not required

		-- Mandatory for CC and IRI, with certain exceptions (see 5.2.4)

		-- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4)

	deliveryCountryCode				[2] PrintableString (SIZE (2)) OPTIONAL,

		-- see clause 5.2.4

	...,
@@ -352,7 +349,6 @@ IRIPayload ::= SEQUENCE 
		-- If the payloadDirection field is to be used for a given service then

		-- the exact meaning and use of the field will be described in the

		-- relevant service-specific details



}



IRIType ::= ENUMERATED
@@ -435,7 +431,7 @@ GcseIRI ::= CHOICE 
	-- This structure may be commented out if not used

{

	iRI-Gcse-Parameters	[0] GCSEHI2Operations.IRI-Parameters,

	gcseIRIsContent		[1] GCSEIRIsContent,

	gcseIRIsContent		[1] GcseIRIsContent,

	...

}
@@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE 
		-- (see clause 7.2.3)

	checkValue				[3] OCTET STRING,

		-- Network byte order

		-- In case of a DSA/DSS signature, the r and s values shall be concatenated

	...

		-- If checkValue contains a signature, the octet string field space may be

		-- used to insert the appropriate ASN.1 DER or BER encoded structure for the

		-- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43].

	...,

	hashAlgorithm			[4] HashAlgorithm OPTIONAL

		-- Clarifies the hash function if checkType is hash(1).

		-- If used, it shall be present for each checkType hash(1).

}



CheckType ::= ENUMERATED

{

	hash(1),

		-- SHA-1 hash value

		-- hash value

	signature(2),

		-- DSS/DSA signature

	...
@@ -494,6 +495,20 @@ DataType ::= ENUMERATED 
	...

}





HashAlgorithm ::= ENUMERATED

{

	sHA-1(1),

		-- Included for legacy/migration purposes only, not to be used for new implementations

	sHA-256(2),

	sHA-384(3),

	sHA-512(4),

	...

}









Option ::= CHOICE

{

	pDUAcknowledgement	[0] NULL,
@@ -604,9 +619,9 @@ EncryptedPayloadType ::= ENUMERATED 
		-- encrypted payload is TS 102 232 part 1 (the present document)

}



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

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

-- Common Parameters

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

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



Location ::= SEQUENCE

	-- This is a common parameter, the use of this parameter is described in clause 4.5
@@ -615,7 +630,6 @@ Location ::= SEQUENCE 
	epsLocation				[1] EpsHI2Operations.EPSLocation OPTIONAL,

	...,

	wlanLocationAttributes	[2]	WlanLocationAttributes OPTIONAL



}



WlanLocationAttributes ::= SEQUENCE
@@ -626,4 +640,5 @@ WlanLocationAttributes ::= SEQUENCE 
}







END --end of LI-PS-PDU

102232-1/portal/LI-PS-PDU,ver24.txt→102232-1/portal/LI-PS-PDU,ver25.txt

+63 −48
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) version24(24)}

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



DEFINITIONS IMPLICIT TAGS ::=
@@ -14,7 +14,7 @@ IMPORTS 
	IRIsContent,

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



	-- from TS 101 671 [4]

	HI1-Operation
@@ -55,7 +55,6 @@ IMPORTS 
	PstnIsdnIRI

		FROM PstnIsdnPDU

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)}



	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	UmtsIRIsContent,
@@ -101,7 +100,7 @@ IMPORTS 


	-- from 3GPP TS 33.108 [9]

	IRI-Parameters,

	GCSEIRIsContent

	GcseIRIsContent

		FROM GCSEHI2Operations

		{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)}

			-- The relevant module (including the 3GPP release and version number) needs
@@ -110,14 +109,14 @@ IMPORTS 
	-- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Umts-HI3-PS

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

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)}

            -- The relevant module (including the 3GPP  release and version number)

            -- needs to be chosen when compiling the application.



    -- from 3GPP TS 33.108 [9]

    CC-PDU

        FROM Eps-HI3-PS

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3eps(9)}

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)}

            -- The relevant module (including the 3GPP  release and version number)

            -- needs to be chosen when compiling the application.
@@ -151,8 +150,7 @@ IMPORTS 
			-- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are

			-- corresponding to different implementations and exclusive usage each other.

			-- The implementation depends of national regulations or LEA/CSP negotiations.

			-- 3GPP HI1 may be used with other services/networks than 3GPP’s one.



			-- 3GPP HI1 may be used with other services/networks than 3GPP's one.



	-- from TS 101 909-20-1 [33]

	TARGETACTIVITYMONITOR-1,
@@ -187,7 +185,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) version24(24)}

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



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

-- Top-level definition
@@ -227,7 +225,6 @@ Payload ::= CHOICE 
	encryptionContainer		[4] EncryptionContainer,

	threeGPP-HI1-Operation	[5] ThreeGPP-HI1-Operation

		-- This structure may be functionally redundant with hI1-Operation from TS 101 671



}



TimeStampQualifier ::= ENUMERATED
@@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE 
	networkIdentifier				[0] NetworkIdentifier,

	communicationIdentityNumber		[1] INTEGER (0..4294967295) OPTIONAL,

		-- in case of transport of HI1 messages not required

		-- Mandatory for CC and IRI, with certain exceptions (see 5.2.4)

		-- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4)

	deliveryCountryCode				[2] PrintableString (SIZE (2)) OPTIONAL,

		-- see clause 5.2.4

	...,
@@ -352,7 +349,6 @@ IRIPayload ::= SEQUENCE 
		-- If the payloadDirection field is to be used for a given service then

		-- the exact meaning and use of the field will be described in the

		-- relevant service-specific details



}



IRIType ::= ENUMERATED
@@ -435,7 +431,7 @@ GcseIRI ::= CHOICE 
	-- This structure may be commented out if not used

{

	iRI-Gcse-Parameters	[0] GCSEHI2Operations.IRI-Parameters,

	gcseIRIsContent		[1] GCSEIRIsContent,

	gcseIRIsContent		[1] GcseIRIsContent,

	...

}
@@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE 
		-- (see clause 7.2.3)

	checkValue				[3] OCTET STRING,

		-- Network byte order

		-- In case of a DSA/DSS signature, the r and s values shall be concatenated

	...

		-- If checkValue contains a signature, the octet string field space may be

		-- used to insert the appropriate ASN.1 DER or BER encoded structure for the

		-- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43].

	...,

	hashAlgorithm			[4] HashAlgorithm OPTIONAL

		-- Clarifies the hash function if checkType is hash(1).

		-- If used, it shall be present for each checkType hash(1).

}



CheckType ::= ENUMERATED

{

	hash(1),

		-- SHA-1 hash value

		-- hash value

	signature(2),

		-- DSS/DSA signature

	...
@@ -494,6 +495,20 @@ DataType ::= ENUMERATED 
	...

}





HashAlgorithm ::= ENUMERATED

{

	sHA-1(1),

		-- Included for legacy/migration purposes only, not to be used for new implementations

	sHA-256(2),

	sHA-384(3),

	sHA-512(4),

	...

}









Option ::= CHOICE

{

	pDUAcknowledgement	[0] NULL,
@@ -604,9 +619,9 @@ EncryptedPayloadType ::= ENUMERATED 
		-- encrypted payload is TS 102 232 part 1 (the present document)

}



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

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

-- Common Parameters

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

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



Location ::= SEQUENCE

	-- This is a common parameter, the use of this parameter is described in clause 4.5
@@ -615,7 +630,6 @@ Location ::= SEQUENCE 
	epsLocation				[1] EpsHI2Operations.EPSLocation OPTIONAL,

	...,

	wlanLocationAttributes	[2]	WlanLocationAttributes OPTIONAL



}



WlanLocationAttributes ::= SEQUENCE
@@ -626,4 +640,5 @@ WlanLocationAttributes ::= SEQUENCE 
}







END --end of LI-PS-PDU