diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index c85780833ebbe414989464aae34003e9ff785326..25f72fc6b49f91d65a74524745105796e2b7aa78 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} 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) version211(211)} + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} -- from ETSI TS 101 671 [4] @@ -20,12 +20,12 @@ IMPORTS Location, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from ETSI TS 101 671 [4] HI1-Operation FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} -- from ETSI TS 102 232-2 [5] EmailCC, @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -181,21 +181,10 @@ IMPORTS FROM TS101909202 {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] @@ -215,7 +204,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) version31(31)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} -- ==================== -- Top-level definition @@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL + timeStampQualifier [8] TimeStampQualifier OPTIONAL, + extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, + -- see clause 5.2.13 + networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL + -- see clause 5.2.14 } Payload ::= CHOICE @@ -283,10 +276,10 @@ HI4Payload ::= CHOICE CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., cINExtension [3] CorrelationValues OPTIONAL @@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { + -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) emailCC [1] EmailCC, iPCC [2] IPCC, + -- tag [3] not used uMTSCC [4] OCTET STRING, ..., + -- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, @@ -347,7 +343,7 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, @@ -404,6 +400,7 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { + -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly, @@ -416,8 +413,8 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingIRI [14] MessagingIRI, ePSIRI [15] EPSIRI, confIRI [16] ConfIRI, @@ -735,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID -- module to preserve the original type name during the -- removal of imports from ETSI TS 101 671 [4]. -END --end of LI-PS-PDU +END --end of LI-PS-PDU \ No newline at end of file diff --git a/102232-1/portal/LI-PS-PDU,ver31.txt b/102232-1/portal/LI-PS-PDU,ver32.txt similarity index 95% rename from 102232-1/portal/LI-PS-PDU,ver31.txt rename to 102232-1/portal/LI-PS-PDU,ver32.txt index c85780833ebbe414989464aae34003e9ff785326..3db7298861de3ca0846d03990df954cac4ffde3f 100644 --- a/102232-1/portal/LI-PS-PDU,ver31.txt +++ b/102232-1/portal/LI-PS-PDU,ver32.txt @@ -1,5 +1,5 @@ LI-PS-PDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version32(32)} 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) version211(211)} + {itu-t(0) identified-organization(4) etsi(0) common-parameters(3280) version231(231)} -- from ETSI TS 101 671 [4] @@ -20,12 +20,12 @@ IMPORTS Location, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} -- from ETSI TS 101 671 [4] HI1-Operation FROM HI1NotificationOperations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version6(6)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi1(0) notificationOperations(1) version7(7)} -- from ETSI TS 102 232-2 [5] EmailCC, @@ -34,7 +34,7 @@ IMPORTS MessagingMMCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} -- from ETSI TS 102 232-3 [6] IPCC, @@ -181,21 +181,10 @@ IMPORTS FROM TS101909202 {itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} - -- from J-STD-025-B [39] - LAESProtocol - FROM Laesp-j-std-025-b - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} - CDMA2000LAESMessage - FROM CDMA2000CIIModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} - CCIPPacketHeader - FROM CDMA2000CCModule - {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)} - -- from ETSI TS 103 462 [45] ILHIPayload FROM ILHIPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version2(2)} -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] @@ -215,7 +204,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) version31(31)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version32(32)} -- ==================== -- Top-level definition @@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, - timeStampQualifier [8] TimeStampQualifier OPTIONAL + timeStampQualifier [8] TimeStampQualifier OPTIONAL, + extendedInterceptionPointID [9] OCTET STRING (SIZE (1..65535)) OPTIONAL, + -- see clause 5.2.13 + networkFunctionIdentifier [10] OCTET STRING (SIZE (1..65535)) OPTIONAL + -- see clause 5.2.14 } Payload ::= CHOICE @@ -283,10 +276,10 @@ HI4Payload ::= CHOICE CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, - communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, + communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) - deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, + deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., cINExtension [3] CorrelationValues OPTIONAL @@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { + -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) emailCC [1] EmailCC, iPCC [2] IPCC, + -- tag [3] not used uMTSCC [4] OCTET STRING, ..., + -- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, @@ -347,7 +343,7 @@ CCContents ::= CHOICE cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingCC [14] MessagingCC, ePSCC [15] OCTET STRING, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, @@ -404,6 +400,7 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { + -- tag [0] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02) emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly, @@ -416,8 +413,8 @@ IRIContents ::= CHOICE tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, pstnIsdnIRI [10] PstnIsdnIRI, iPMMIRI [11] IPMMIRI, - lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, - cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, + -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) + -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07) messagingIRI [14] MessagingIRI, ePSIRI [15] EPSIRI, confIRI [16] ConfIRI,