Commit f15c859a authored by markc's avatar markc

Merge branch 'meeting/LI57e' into 'master'

Meeting/li57e

See merge request !39
parents c986c007 58e059ae
Pipeline #8769 failed with stage
LI-PS-PDU 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 ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -11,7 +11,7 @@ IMPORTS ...@@ -11,7 +11,7 @@ IMPORTS
-- from ETSI TS 103 280 [44] -- from ETSI TS 103 280 [44]
LIID LIID
FROM Common-Parameters 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] -- from ETSI TS 101 671 [4]
...@@ -20,12 +20,12 @@ IMPORTS ...@@ -20,12 +20,12 @@ IMPORTS
Location, Location,
Network-Element-Identifier Network-Element-Identifier
FROM HI2Operations 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] -- from ETSI TS 101 671 [4]
HI1-Operation HI1-Operation
FROM HI1NotificationOperations 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] -- from ETSI TS 102 232-2 [5]
EmailCC, EmailCC,
...@@ -34,7 +34,7 @@ IMPORTS ...@@ -34,7 +34,7 @@ IMPORTS
MessagingMMCC, MessagingMMCC,
MessagingIRI MessagingIRI
FROM EmailPDU 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] -- from ETSI TS 102 232-3 [6]
IPCC, IPCC,
...@@ -181,21 +181,10 @@ IMPORTS ...@@ -181,21 +181,10 @@ IMPORTS
FROM TS101909202 FROM TS101909202
{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} {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] -- from ETSI TS 103 462 [45]
ILHIPayload ILHIPayload
FROM ILHIPDU 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. -- This import is only used for the handover between LEMFs.
-- from 3GPP TS 33.128 [46] -- from 3GPP TS 33.128 [46]
...@@ -215,7 +204,7 @@ IMPORTS ...@@ -215,7 +204,7 @@ IMPORTS
lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} 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 -- Top-level definition
...@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE ...@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE
interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL,
-- see clause 5.2.11 -- see clause 5.2.11
microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, 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 Payload ::= CHOICE
...@@ -283,10 +276,10 @@ HI4Payload ::= CHOICE ...@@ -283,10 +276,10 @@ HI4Payload ::= CHOICE
CommunicationIdentifier ::= SEQUENCE CommunicationIdentifier ::= SEQUENCE
{ {
networkIdentifier [0] NetworkIdentifier, networkIdentifier [0] NetworkIdentifier,
communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL,
-- in case of transport of HI1 messages not required -- in case of transport of HI1 messages not required
-- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) -- 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 -- see clause 5.2.4
..., ...,
cINExtension [3] CorrelationValues OPTIONAL cINExtension [3] CorrelationValues OPTIONAL
...@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED ...@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE CCContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used, see clause A.3 -- 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, emailCC [1] EmailCC,
iPCC [2] IPCC, iPCC [2] IPCC,
-- tag [3] not used
uMTSCC [4] OCTET STRING, uMTSCC [4] OCTET STRING,
..., ...,
-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
l2CC [6] L2CC, l2CC [6] L2CC,
tTRAFFIC-1 [7] TS101909201.TTRAFFIC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC,
cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC,
...@@ -347,7 +343,7 @@ CCContents ::= CHOICE ...@@ -347,7 +343,7 @@ CCContents ::= CHOICE
cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC,
pstnIsdnCC [11] PstnIsdnCC, pstnIsdnCC [11] PstnIsdnCC,
iPMMCC [12] IPMMCC, 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, messagingCC [14] MessagingCC,
ePSCC [15] OCTET STRING, ePSCC [15] OCTET STRING,
uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU,
...@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED ...@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED
IRIContents ::= CHOICE IRIContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used (see clause A.3) -- 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, emailIRI [1] EmailIRI,
iPIRI [2] IPIRI, iPIRI [2] IPIRI,
iPIRIOnly [3] IPIRIOnly, iPIRIOnly [3] IPIRIOnly,
...@@ -416,8 +413,8 @@ IRIContents ::= CHOICE ...@@ -416,8 +413,8 @@ IRIContents ::= CHOICE
tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR,
pstnIsdnIRI [10] PstnIsdnIRI, pstnIsdnIRI [10] PstnIsdnIRI,
iPMMIRI [11] IPMMIRI, iPMMIRI [11] IPMMIRI,
lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
messagingIRI [14] MessagingIRI, messagingIRI [14] MessagingIRI,
ePSIRI [15] EPSIRI, ePSIRI [15] EPSIRI,
confIRI [16] ConfIRI, confIRI [16] ConfIRI,
...@@ -735,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID ...@@ -735,4 +732,4 @@ LawfulInterceptionIdentifier ::= LIID
-- module to preserve the original type name during the -- module to preserve the original type name during the
-- removal of imports from ETSI TS 101 671 [4]. -- 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
LI-PS-PDU 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 ::= DEFINITIONS IMPLICIT TAGS ::=
...@@ -11,7 +11,7 @@ IMPORTS ...@@ -11,7 +11,7 @@ IMPORTS
-- from ETSI TS 103 280 [44] -- from ETSI TS 103 280 [44]
LIID LIID
FROM Common-Parameters 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] -- from ETSI TS 101 671 [4]
...@@ -20,12 +20,12 @@ IMPORTS ...@@ -20,12 +20,12 @@ IMPORTS
Location, Location,
Network-Element-Identifier Network-Element-Identifier
FROM HI2Operations 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] -- from ETSI TS 101 671 [4]
HI1-Operation HI1-Operation
FROM HI1NotificationOperations 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] -- from ETSI TS 102 232-2 [5]
EmailCC, EmailCC,
...@@ -34,7 +34,7 @@ IMPORTS ...@@ -34,7 +34,7 @@ IMPORTS
MessagingMMCC, MessagingMMCC,
MessagingIRI MessagingIRI
FROM EmailPDU 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] -- from ETSI TS 102 232-3 [6]
IPCC, IPCC,
...@@ -181,21 +181,10 @@ IMPORTS ...@@ -181,21 +181,10 @@ IMPORTS
FROM TS101909202 FROM TS101909202
{itu-t(0) identified-organization(4) etsi(0) ts101909(1909) part20(20) subpart2(2) interceptVersion(0)} {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] -- from ETSI TS 103 462 [45]
ILHIPayload ILHIPayload
FROM ILHIPDU 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. -- This import is only used for the handover between LEMFs.
-- from 3GPP TS 33.128 [46] -- from 3GPP TS 33.128 [46]
...@@ -215,7 +204,7 @@ IMPORTS ...@@ -215,7 +204,7 @@ IMPORTS
lawfulInterceptDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} 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 -- Top-level definition
...@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE ...@@ -242,7 +231,11 @@ PSHeader ::= SEQUENCE
interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL,
-- see clause 5.2.11 -- see clause 5.2.11
microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, 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 Payload ::= CHOICE
...@@ -283,10 +276,10 @@ HI4Payload ::= CHOICE ...@@ -283,10 +276,10 @@ HI4Payload ::= CHOICE
CommunicationIdentifier ::= SEQUENCE CommunicationIdentifier ::= SEQUENCE
{ {
networkIdentifier [0] NetworkIdentifier, networkIdentifier [0] NetworkIdentifier,
communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL,
-- in case of transport of HI1 messages not required -- in case of transport of HI1 messages not required
-- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) -- 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 -- see clause 5.2.4
..., ...,
cINExtension [3] CorrelationValues OPTIONAL cINExtension [3] CorrelationValues OPTIONAL
...@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED ...@@ -336,10 +329,13 @@ PayloadDirection ::= ENUMERATED
CCContents ::= CHOICE CCContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used, see clause A.3 -- 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, emailCC [1] EmailCC,
iPCC [2] IPCC, iPCC [2] IPCC,
-- tag [3] not used
uMTSCC [4] OCTET STRING, uMTSCC [4] OCTET STRING,
..., ...,
-- tag [5] deprecated in version15, ETSI TS 102 232-1 V3.3.1 (2013-02)
l2CC [6] L2CC, l2CC [6] L2CC,
tTRAFFIC-1 [7] TS101909201.TTRAFFIC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC,
cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC,
...@@ -347,7 +343,7 @@ CCContents ::= CHOICE ...@@ -347,7 +343,7 @@ CCContents ::= CHOICE
cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC,
pstnIsdnCC [11] PstnIsdnCC, pstnIsdnCC [11] PstnIsdnCC,
iPMMCC [12] IPMMCC, 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, messagingCC [14] MessagingCC,
ePSCC [15] OCTET STRING, ePSCC [15] OCTET STRING,
uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU,
...@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED ...@@ -404,6 +400,7 @@ IRIType ::= ENUMERATED
IRIContents ::= CHOICE IRIContents ::= CHOICE
-- Any of these choices may be commented out if they are not being used (see clause A.3) -- 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, emailIRI [1] EmailIRI,
iPIRI [2] IPIRI, iPIRI [2] IPIRI,
iPIRIOnly [3] IPIRIOnly, iPIRIOnly [3] IPIRIOnly,
...@@ -416,8 +413,8 @@ IRIContents ::= CHOICE ...@@ -416,8 +413,8 @@ IRIContents ::= CHOICE
tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR, tARGETACTIVITYMONITOR-2 [9] TS101909202.TARGETACTIVITYMONITOR,
pstnIsdnIRI [10] PstnIsdnIRI, pstnIsdnIRI [10] PstnIsdnIRI,
iPMMIRI [11] IPMMIRI, iPMMIRI [11] IPMMIRI,
lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, -- tag [12] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, -- tag [13] deprecated in version32, ETSI TS 102 232-1 V3.24.1 (2021-07)
messagingIRI [14] MessagingIRI, messagingIRI [14] MessagingIRI,
ePSIRI [15] EPSIRI, ePSIRI [15] EPSIRI,
confIRI [16] ConfIRI, confIRI [16] ConfIRI,
......
This diff is collapsed.
-- ============================
-- Description of the Email PDU
-- ============================
EmailPDU 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)}
DEFINITIONS IMPLICIT TAGS ::= DEFINITIONS IMPLICIT TAGS ::=
BEGIN BEGIN
IMPORTS IMPORTS
-- from TS 102 232-1 [3] -- from ETSI TS 102 232-1 [3]
IPAddress IPAddress
FROM LI-PS-PDU FROM LI-PS-PDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}
-- from TS 102 232-5 [38] -- from ETSI TS 102 232-5 [38]
IPMMCC IPMMCC
FROM IPMultimediaPDU FROM IPMultimediaPDU
{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)};
...@@ -21,11 +25,12 @@ IMPORTS ...@@ -21,11 +25,12 @@ IMPORTS
-- Object Identifier Definition -- Object Identifier Definition
-- ============================ -- ============================
emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)}
emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)}
messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)}
messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)}
messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)}
messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)}
-- definitions are relative to -- definitions are relative to
-- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
...@@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE ...@@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE
client-Octets-Sent [7] INTEGER, client-Octets-Sent [7] INTEGER,
protocol-ID [8] E-mail-Protocol, protocol-ID [8] E-mail-Protocol,
e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL,
-- Not available in some cases; if a value is available, it must be provided -- Not available in some cases; if a value is available, it shall be provided.
-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
e-mail-Recipients [10] E-mail-Address-List OPTIONAL, e-mail-Recipients [10] E-mail-Address-List OPTIONAL,
-- Not available in some cases; if a value is available, it must be provided -- Not available in some cases; if a value is available, it shall be provided
-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
status [11] E-mail-Status, status [11] E-mail-Status,
total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL,
message-ID [13] OCTET STRING OPTIONAL, message-ID [13] OCTET STRING OPTIONAL,
...@@ -149,7 +156,7 @@ AAAInformation ::= CHOICE ...@@ -149,7 +156,7 @@ AAAInformation ::= CHOICE
-- The AAAInformation field allows for POP3 and authenticated SMTP AAA information -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information
{ {
pOP3AAAInformation [0] POP3AAAInformation, pOP3AAAInformation [0] POP3AAAInformation,
aSMTPAAAInformation [1] ASMTPAAAInformation, aSMTPAAAInformation [1] ASMTPAAAInformation,
..., ...,
iMAPAAAInformation [2] IMAPAAAInformation iMAPAAAInformation [2] IMAPAAAInformation
} }
...@@ -210,7 +217,7 @@ AAAauthMethod ::= ENUMERATED ...@@ -210,7 +217,7 @@ AAAauthMethod ::= ENUMERATED
MessagingCC ::= SEQUENCE MessagingCC ::= SEQUENCE
-- MessagingCC is the PDU sent for the captured content -- MessagingCC is the PDU sent for the captured content
{ {
messaging-cc-obj-id [0] RELATIVE-OID, messaging-cc-obj-id [0] RELATIVE-OID,
event-identifier [1] INTEGER (0..4294967295), event-identifier [1] INTEGER (0..4294967295),
-- Used to correlate to MessagingIRI within the same CIN -- Used to correlate to MessagingIRI within the same CIN
content-identifier [2] INTEGER (0..4294967295) OPTIONAL, content-identifier [2] INTEGER (0..4294967295) OPTIONAL,
...@@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE ...@@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE
-- Refer to IETF RFC 2045 [20] -- Refer to IETF RFC 2045 [20]
} }
MessagingMMCC ::= SEQUENCE MessagingMMCC ::= SEQUENCE
-- MessagingMMCC is the PDU sent for the captured IPMMCC content -- MessagingMMCC is the PDU sent for the captured IPMMCC content
{ {
...@@ -306,8 +314,7 @@ Messaging-Box-Event ::= ENUMERATED ...@@ -306,8 +314,7 @@ Messaging-Box-Event ::= ENUMERATED
disconnect(16), disconnect(16),
connect(17), connect(17),
..., ...,
unknown(0), unknown(0),
greeting-play(18), greeting-play(18),
language-change(19), language-change(19),
pin-security-enable(20), pin-security-enable(20),
...@@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED ...@@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED
personal-operator-remove(24), personal-operator-remove(24),
additional-destination-add(25), additional-destination-add(25),
additional-destination-change(26), additional-destination-change(26),
additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) additional-destination-remove(27),
auto-play-enable(28),
auto-play-disable(29),
header-play-enable(30),
header-play-disable(31)
} }
Messaging-Notification-Event ::= ENUMERATED Messaging-Notification-Event ::= ENUMERATED
...@@ -357,7 +368,7 @@ Messaging-Party-Information ::= SEQUENCE ...@@ -357,7 +368,7 @@ Messaging-Party-Information ::= SEQUENCE
party-identity [1] Messaging-Party-Identity, party-identity [1] Messaging-Party-Identity,
..., ...,
party-validity [2] Messaging-Party-Validity OPTIONAL, party-validity [2] Messaging-Party-Validity OPTIONAL,
copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL
} }
Messaging-Party-Qualifier ::= ENUMERATED Messaging-Party-Qualifier ::= ENUMERATED
...@@ -372,52 +383,54 @@ Messaging-Party-Qualifier ::= ENUMERATED ...@@ -372,52 +383,54 @@ Messaging-Party-Qualifier ::= ENUMERATED
-- the terminating party and all information provided by this party. -- the terminating party and all information provided by this party.
..., ...,
associated-party(3) associated-party(3)
-- In this case, the partyInformation parameter provides the identites related to -- In this case, the partyInformation parameter provides the identities related to
-- an associated party and all information provided by this party -- an associated party and all information provided by this party.
} }
Messaging-Party-Identity ::= CHOICE Messaging-Party-Identity ::= CHOICE
{ {
msisdn [0] OCTET STRING (SIZE (1..9)), msisdn [0] OCTET STRING (SIZE (1..9)),
-- MSISDN of the target, encoded in the same format as the AddressString -- MSISDN of the target, encoded in the same format as the AddressString
-- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8. -- parameters defined in MAP format 3GPP TS 09.02 [22], clause 17.7.8.
e164-format [1] OCTET STRING (SIZE (1..25)), e164-format [1] OCTET STRING (SIZE (1..25)),
-- E.164 address of the node in international format. Coded in the same format as -- E.164 address of the node in international format. Coded in the same format as
-- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23]) -- the calling party number parameter of the ISUP (parameter part: EN 300 356 [23])
email-address [2] E-mail-Address-List, email-address [2] E-mail-Address-List,
-- Note that as of version 3.13.1, this field may contain RFC 6530-compliant addresses.
..., ...,
ip-address [3] IPAddress, ip-address [3] IPAddress,
--IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] –-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
alphanumeric [4] UTF8String, alphanumeric [4] UTF8String,
ip-address-and-port [5] IP-Address-And-Port, ip-address-and-port [5] IP-Address-And-Port,
imsi [6] OCTET STRING (SIZE (3..8)), imsi [6] OCTET STRING (SIZE (3..8)),
-- International Mobile Subscriber Identity of the target, encoded in the same format as the -- International Mobile Subscriber Identity of the target, encoded in the same format as the
-- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.
-- It is described in 3GPP TS 23.003 [37] clause 2.2. -- It is described in 3GPP TS 23.003 [37] clause 2.2.
imei [7] OCTET STRING (SIZE (8)), imei [7] OCTET STRING (SIZE (8)),
-- International Mobile Equipment Identity of the target, encoded in the same format as the -- International Mobile Equipment Identity of the target, encoded in the same format as the
-- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8.
fax-url [8] OCTET STRING, –- It is defined in 3GPP TS 23.003 [37] clause 6.
fax-url [8] OCTET STRING,
-- see format defined in RFC 2806 [29]. -- see format defined in RFC 2806 [29].
tel-url [9] OCTET STRING, tel-url [9] OCTET STRING,
-- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. -- see format used in 3GPP TS 33.108 [5], 3GPP TS 24.229 [30] and defined in RFC 2806 [29].
modem-url [10] OCTET STRING, modem-url [10] OCTET STRING,
-- see format defined in RFC 2806 [29]. -- see format defined in RFC 2806 [29].
sip-uri [11] OCTET STRING, sip-uri [11] OCTET STRING,
-- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32].
sips-uri [12] OCTET STRING, sips-uri [12] OCTET STRING,
-- see format defined in RFC 3261 [32]. -- see format defined in RFC 3261 [32].
nai [13] OCTET STRING nai [13] OCTET STRING
-- Network Access Identity of the party, encoded in the same format as used EPS -- Network Access Identity of the party, encoded in the same format as used EPS
-- domain in TS 133.108 [5] and defined in RFC 4282 [33]. –- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33].
} }
IP-Address-And-Port ::= SEQUENCE IP-Address-And-Port ::= SEQUENCE
{ {
ip-address [0] IPAddress, ip-address [0] IPAddress,
-- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] –- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34]
port-number [1] INTEGER, port-number [1] INTEGER,
-- port-number is defined by IETF RFC 6533 [35] –- port-number is defined by IETF RFC 6335 [35]
... ...
} }
...@@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED ...@@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED
... ...
} }
Messaging-Trigger ::= ENUMERATED Messaging-Trigger ::= ENUMERATED
{ {
unknown(0), unknown(0),
...@@ -457,9 +469,9 @@ Messaging-Property ::= CHOICE ...@@ -457,9 +469,9 @@ Messaging-Property ::= CHOICE
greeting-type [2] Messaging-Property-Greeting-Type, greeting-type [2] Messaging-Property-Greeting-Type,
notification-type [3] Messaging-Property-Notification-Type, notification-type [3] Messaging-Property-Notification-Type,
language [4] OCTET STRING, language [4] OCTET STRING,
-- Language according to RFC 3066 [24] -- Language according to RFC 4646 [24]
message-identifier [5] OCTET STRING, message-identifier [5] OCTET STRING,
subject [6] UTF8String, subject [6] UTF8String,
user-agent [7] UTF8String, user-agent [7] UTF8String,
password [8] OCTET STRING, password [8] OCTET STRING,
message-status [9] Messaging-Property-Message-Status, message-status [9] Messaging-Property-Message-Status,
...@@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED ...@@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED
allow-delivery-report(6), allow-delivery-report(6),
deny-delivery-report(7), deny-delivery-report(7),
message-wait-indication(8), message-wait-indication(8),
voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) voice-to-text(9),
new-message-sms(10),
new-message-outcall(11),
new-message-reminder(12)
} }
Messaging-Property-Message-Status ::= ENUMERATED Messaging-Property-Message-Status ::= ENUMERATED
......
...@@ -29,4 +29,3 @@ ...@@ -29,4 +29,3 @@
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:schema> </xs:schema>
-----BEGIN PRIVATE KEY-----
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDc9UQSsRmchhOC
ixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvMOyvBCHq4c3M8hBxt9zKD
mV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3Jpyx3b4r8IVoUDXai2sjX
8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8FJfRl2ttWlSFMA2252ak
OwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAafTFV1eM/dTOSEKYCHVCN0
cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eTPunYJGanai6PLLr5zNWX
lvcj/YbZAgMBAAECggEAbm1BPRo3U4uKWpaNmFPdrU3VdlYK9CUCgU8X2PPF4HRN
TAiBZG6smGqocIQt5MYJFv/T2q2ny6lcHHrdT0BHxpoRRYMqIsZ26bk+o7DxheqU
LiPdGtiyaX+6CZq71WDwk/tTGmx0GwW+lHXdv9h+iLQxGD4nVXoxWAPgxdEGnONY
gSYbOhXz+MEFZaW8HnVPfoA+RR9Hg59gnmBCZlhbahqf3WnjAwgS0nsbSUN57wVi
FcWHWLyzv94bQHcTgalXqVakQv5+ymJKF4ImiYUP2rLPQ8ubqwmdQ6xI8Gp3AGCr
FY5koP3JT2mMY+aZJEEGWE3U4JRDyrkOpI34No8iEQKBgQD6niFOopCjE2k7eIFr
c+s5Khp3ITmcgV4tycxngXOQw8GnPEzzZUW7xodTiMPLYz/8lFbJvCAWCeQpmVWX
U8OX9anzY0U0ILbolXpdpGdZkBHbKWtAVBNOZ/lY0SAmt6/ZWf/EcqpMm/fH+iph
aqafwQuX4qhy9HlwY2qwyj5y5QKBgQDhtBH9/9Hy0X2HI+uzNRaU0y1BqvuqjHOf
1v57DM5uYF0MAp1SAfAJcx+jUXdf28Nr4GlxBIvQumq6rsvfKhqBINsKgJf/4+PA
Lv+fofeUEEqrGHuecB4NbdHP5XIIiuyyuOtRhGq/sclOQSZAa1kxajGvDI1AVHL4
LCwcy9HA5QKBgQDIq+2HhWvC6DwOvoMCgyMJ9siSMyxqQLwkdb0R8/mRJO3e9s22
5pRbsq+RF6WPKb2GhVCo39XhT7I+DOUX8p5fAvo+RHKZNsi+m1ILwSRv9ogVsKiM
LcX3thFWKL1RwysvIn1F03rBNPHGUm206yzYJj8eMwMmaNMERtabEJXIcQKBgHct
Kvbwlr5daafrCrDkzlilLVdoXlzOrtrung8BUxsrHNaTptg/l6yVslX9VUgzdXvH
0kVP/jenx2VtmM7sn3Qhkid4gUon3gGDj4yN7HmtJJA1bEjbsLKsk0XwRIdIO/We
+PphLjCsQrxkYDtRs5YJGdTxjsAyF0b9pAlMgiQVAoGBAK/NGV5+IPDHEmz0CNJN
ApaA2jG8KrsIPWNpgOC3CxPMT3kWYK601y0CLw8ZpUnVTMfPkKMSOVsqaOpHV6eP
Oecq3bP1CiNunro+j3EOIDIST2ttrlNuKIBaiz63ZMNDbs/DyaGL8Zf688OJCXsb
yCWSJh8NbrNblNfI0jaMoTGw
-----END PRIVATE KEY-----
-----BEGIN CERTIFICATE-----
MIIC/zCCAeegAwIBAgIUUOGdj0hEfnnW9gqIOCTJ9EUocnMwDQYJKoZIhvcNAQEL
BQAwDzENMAsGA1UEAwwEdGVzdDAeFw0yMTA2MjUwNzIyMDlaFw0yNDAzMjEwNzIy
MDlaMA8xDTALBgNVBAMMBHRlc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
AoIBAQDc9UQSsRmchhOCixyrHvmjmDFeIApVlfTfVV5RJL/280wDlAYymhAcEcvM
OyvBCHq4c3M8hBxt9zKDmV+NbcDqXyblt8rVpjzbggn3Ch2dMJ/kLNO+O+WJSl3J
pyx3b4r8IVoUDXai2sjX8jLNYI4TC673X3xX1VikzcGwFjt2zbL+WLHEnvUVeG/8
FJfRl2ttWlSFMA2252akOwtAPF4AKJBW5pXSeILA+K32bf+Y5JMODWwI+njylAaf
TFV1eM/dTOSEKYCHVCN0cxiO6KCC2GSzLeQEGWmh/C+uyhSlLW/6EyEHJcLdi6eT
PunYJGanai6PLLr5zNWXlvcj/YbZAgMBAAGjUzBRMB0GA1UdDgQWBBSFT3NqexF1
LcYkjqUr9MMTIFp/ATAfBgNVHSMEGDAWgBSFT3NqexF1LcYkjqUr9MMTIFp/ATAP
BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCzwydpNgq680qWmd0D
4ya9fHUopeX7LBSYOU7NU3CagjXnUMwaCmSpokkH0Wvn1UtXDUF+slA9bEeXkfZm