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, diff --git a/102232-2/EmailPDU.asn b/102232-2/EmailPDU.asn index 881e769b4d32cda54fa6d9ca05a0c572f32db3ef..ee361beeb217cee98ca533062795a33bf9535dcb 100644 --- a/102232-2/EmailPDU.asn +++ b/102232-2/EmailPDU.asn @@ -1,529 +1,544 @@ -EmailPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version17(17)} - -DEFINITIONS IMPLICIT TAGS ::= -BEGIN - -IMPORTS - - -- from TS 102 232-1 [3] - IPAddress - FROM LI-PS-PDU - {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] - IPMMCC - FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; - - --- ============================ --- Object Identifier Definition --- ============================ - -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} - - -- definitions are relative to - -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} - - --- ============================= --- Email Communications Contents --- ============================= - -EmailCC ::= SEQUENCE - -- EmailCC is the PDU sent for each "piece" of E-mail captured content -{ - emailCCObjId [0] RELATIVE-OID, - email-Format [1] Email-Format, - content [2] OCTET STRING - -- Network byte order -} - -Email-Format ::= ENUMERATED -{ - ip-packet(1), - -- When this is the email format, the content will contain the bytes of the IP packet from - -- the IP header through to the end of the IP packet - -- Meets requirement E.2.7 - application(2) - -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) - -- Meets requirement E.2.8 -} - --- ======================================= --- Intercept-related information for Email --- ======================================= - -EmailIRI ::= SEQUENCE - -- EmailIRI is the PDU sent for each "piece" of E-mail IRI -{ - emailIRIObjId [0] RELATIVE-OID, - eventType [1] E-mail-Event, - client-Address [2] IPAddress OPTIONAL, - -- Provided if available - server-Address [3] IPAddress OPTIONAL, - -- Provided if available - client-Port [4] INTEGER OPTIONAL, - -- Provided if available - server-Port [5] INTEGER OPTIONAL, - -- Provided if available - server-Octets-Sent [6] INTEGER, - client-Octets-Sent [7] INTEGER, - protocol-ID [8] E-mail-Protocol, - e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - e-mail-Recipients [10] E-mail-Address-List OPTIONAL, - -- Not available in some cases; if a value is available, it must be provided - status [11] E-mail-Status, - total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, - message-ID [13] OCTET STRING OPTIONAL, - -- Network byte order - nationalParameter [14] OCTET STRING OPTIONAL, - -- Completely defined on a national basis, including byte ordering - ..., - national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, - -- Completely defined on a national basis - aAAInformation [16] AAAInformation OPTIONAL, - e-mail-Sender-Validity [17] ENUMERATED - { - validated(0), - -- The operator has assured the e-mail-sender - nonvalidated(1), - -- The operator does not assure the e-mail-sender - ... - } OPTIONAL -} - -E-mail-Status ::= ENUMERATED -{ - status-unknown(1), - operation-failed(2), - operation-succeeded(3) -} - -E-mail-Event ::= ENUMERATED -{ - e-mail-send(1), - e-mail-receive(2), - e-mail-download(3), - ..., - e-mail-logon-attempt(4), - e-mail-logon(5), - e-mail-logon-failure(6), - e-mail-logoff(7), - e-mail-partial-download(8), - e-mail-upload(9) -} - -E-mail-Protocol ::= ENUMERATED -{ - smtp(1), - pop3(2), - imap4(3), - webmail(4), - -- See Annex H for more information - undefined(255), - -- The protocol is not known or not representable by the current enumeration - ... -} - -E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) - -National-EM-ASN1parameters ::= SEQUENCE -{ - countryCode [1] PrintableString (SIZE (2)), - -- Country Code according to ISO 3166-1 [12], - -- the country to which the parameters inserted after the extension marker apply - ... - -- In case a given country wants to use additional national parameters according to its law, - -- these national parameters should be defined using the ASN.1 syntax and added after the - -- extension marker (...) -} - -AAAInformation ::= CHOICE - -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information -{ - pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, - ..., - iMAPAAAInformation [2] IMAPAAAInformation -} - -POP3AAAInformation ::= SEQUENCE - -- The POP3AAAInformation field contains the POP3 username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -ASMTPAAAInformation ::= SEQUENCE - -- The ASMTPAAAInformation field contains the SMTP username and - -- optionally the authentication fields -{ - username [0] UTF8String (SIZE (0..64)), - authMethod [1] AAAauthMethod OPTIONAL, - -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc - challenge [2] OCTET STRING OPTIONAL, - -- A BASE64 encoded challenge send by the SMTP server - response [3] OCTET STRING OPTIONAL, - -- A BASE64 encoded hashed response returned by the client - aAAResult [4] AAAResult OPTIONAL, - ... -} - -IMAPAAAInformation ::= SEQUENCE - -- The iMAPAAAInformation field contains the IMAP username & optionally the password -{ - username [0] UTF8String (SIZE (0..64)), - password [1] UTF8String (SIZE (0..64)) OPTIONAL, - aAAResult [2] AAAResult OPTIONAL, - ... -} - -AAAResult ::= ENUMERATED -{ - resultUnknown(1), - aAAFailed(2), - aAASucceeded(3), - ... -} - -AAAauthMethod ::= ENUMERATED -{ - undefinedAuthMethod(1), - cramMD5(2), - digestMD5(3), - ... -} - --- ================================= --- Messaging Communications Contents --- ================================= - -MessagingCC ::= SEQUENCE - -- MessagingCC is the PDU sent for the captured content -{ - messaging-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - sequence-number [3] INTEGER (0..4294967295) OPTIONAL, - end-of-sequence [4] BOOLEAN DEFAULT FALSE, - content-type [5] OCTET STRING, - -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA - content [6] OCTET STRING, - ..., - content-transfer-encoding [7] OCTET STRING OPTIONAL - -- MIME Content-Transfer-Encoding mechanism. - -- Refer to IETF RFC 2045 [20] -} - -MessagingMMCC ::= SEQUENCE - -- MessagingMMCC is the PDU sent for the captured IPMMCC content -{ - messaging-mm-cc-obj-id [0] RELATIVE-OID, - event-identifier [1] INTEGER (0..4294967295), - -- Used to correlate to MessagingIRI within the same CIN - content-identifier [2] INTEGER (0..4294967295) OPTIONAL, - content [3] IPMMCC, - ... -} - - --- =========================================== --- Intercept-related information for Messaging --- =========================================== - -MessagingIRI ::= SEQUENCE -{ - messaging-iri-obj-id [0] RELATIVE-OID, - system-type [1] Messaging-System-Type, - system-identifier [2] OCTET STRING OPTIONAL, - -- Identifier up to national agreement, uniquely identifies a certain messaging system - category [3] Messaging-Event-Category OPTIONAL, - status [4] Messaging-Status, - party-information [5] SET OF Messaging-Party-Information OPTIONAL, - trigger [6] Messaging-Trigger, - properties [7] SEQUENCE OF Messaging-Property OPTIONAL, - event-identifier [8] INTEGER (0..4294967295) OPTIONAL, - -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent - original-message [9] OCTET STRING OPTIONAL, - ..., - box-identifier [10] OCTET STRING OPTIONAL -} - -Messaging-System-Type ::= ENUMERATED -{ - unified-messaging(1), - ... -} - -Messaging-Event-Category ::= CHOICE -{ - message [0] Messaging-Event, - message-box [1] Messaging-Box-Event, - message-notification [2] Messaging-Notification-Event, - call [3] Messaging-Call-Event, - ... -} - -Messaging-Event ::= ENUMERATED -{ - deposit(1), - retrieve(2), - delete(3), - save(4), - slamdown(5), - ..., - calendar(6), - contact(7) -} - -Messaging-Box-Event ::= ENUMERATED -{ - login(1), - logout(2), - lock(3), - unlock(4), - activate(5), - deactivate(6), - delete(7), - pin-change(8), - greeting-record(9), - greeting-change(10), - greeting-delete(11), - greeting-enable(12), - greeting-disable(13), - notification-enable(14), - notification-disable(15), - disconnect(16), - connect(17), - ..., - unknown(0), - - greeting-play(18), - language-change(19), - pin-security-enable(20), - pin-security-disable(21), - personal-operator-add(22), - personal-operator-change(23), - personal-operator-remove(24), - additional-destination-add(25), - additional-destination-change(26), - additional-destination-remove(27), auto-play-enable(28), auto-play-disable(29), header-play-enable(30), header-play-disable(31) -} - -Messaging-Notification-Event ::= ENUMERATED -{ - sms(1), - sms-deposit(2), - sms-slamdown(3), - sms-pin-reminder(4), - email(5), - fax-to-email(6), - ..., - mms(7), - generic(8) -} - -Messaging-Call-Event ::= ENUMERATED -{ - callout(1), - ... -} - -Messaging-Status ::= ENUMERATED -{ - unknown(0), - not-applicable(1), - operation-failed(2), - operation-succeeded(3), - operation-cancelled(4), - operation-started(5), - ..., - operation-lost(6) -} - -Messaging-Party-Information ::= SEQUENCE -{ - party-qualifier [0] Messaging-Party-Qualifier, - party-identity [1] Messaging-Party-Identity, - ..., - party-validity [2] Messaging-Party-Validity OPTIONAL, - copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL -} - -Messaging-Party-Qualifier ::= ENUMERATED -{ - unknown-party(0), - -- In this case the party cannot be classified as either originating or terminating - originating-party(1), - -- In this case, the partyInformation parameter provides the identities related to - -- the originating party and all information provided by this party. - terminating-party(2), - -- In this case, the partyInformation parameter provides the identities related to - -- the terminating party and all information provided by this party. - ..., - associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party -} - -Messaging-Party-Identity ::= CHOICE -{ - msisdn [0] OCTET STRING (SIZE (1..9)), - -- 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. - e164-format [1] OCTET STRING (SIZE (1..25)), - -- 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]) - email-address [2] E-mail-Address-List, - ..., - ip-address [3] IPAddress, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), - -- 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. - -- It is described in 3GPP TS 23.003 [37] clause 2.2. - imei [7] OCTET STRING (SIZE (8)), - -- 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 - fax-url [8] OCTET STRING, - -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, - -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, - -- see format defined in RFC 3261 [32]. - nai [13] OCTET STRING - -- 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]. -} - -IP-Address-And-Port ::= SEQUENCE -{ - ip-address [0] IPAddress, - -- IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - port-number [1] INTEGER, - -- port-number is defined by IETF RFC 6533 [35] - ... -} - -Messaging-Party-Validity ::= ENUMERATED -{ - unknown(0), - trusted(1), - untrusted(2), - ... -} - -Messaging-Copy-Qualifier ::= ENUMERATED -{ - unknown(0), - none(1), - cc(2), - bcc(3), - ... -} - - -Messaging-Trigger ::= ENUMERATED -{ - unknown(0), - user(1), - user-agent(2), - system(3), - system-operator(4), - ... -} - -Messaging-Property ::= CHOICE -{ - pincode [0] OCTET STRING (SIZE (1..32)), - ..., - priority [1] Messaging-Property-Priority, - greeting-type [2] Messaging-Property-Greeting-Type, - notification-type [3] Messaging-Property-Notification-Type, - language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, - user-agent [7] UTF8String, - password [8] OCTET STRING, - message-status [9] Messaging-Property-Message-Status, - requested-reports [10] Messaging-Property-Requested-Reports, - expires [11] GeneralizedTime, - message-date [12] GeneralizedTime -} - -Messaging-Property-Priority ::= ENUMERATED -{ - low(1), - medium(2), - high(3), - private(4), - ... -} - -Messaging-Property-Greeting-Type ::= ENUMERATED -{ - general(1), - name(2), - personal(3), - absence(4), - number(5), - ... -} - -Messaging-Property-Notification-Type ::= ENUMERATED -{ - empty-call(1), - lost-call(2), - ..., - message-to-email(3), - read-report(4), - delivery-report(5), - allow-delivery-report(6), - deny-delivery-report(7), - message-wait-indication(8), - voice-to-text(9), new-message-sms(10), new-message-outcall(11), new-message-reminder(12) -} - -Messaging-Property-Message-Status ::= ENUMERATED -{ - indeterminate(0), - expired(1), - retrieved(2), - rejected(3), - deferred(4), - forwarded(5), - unrecognized(6), - unreachable(7), - read(8), - deleted-without-being-read(9), - delivery-condition-not-met(10), - ... -} - -Messaging-Property-Requested-Reports ::= ENUMERATED -{ - none(0), - delivery(1), - read(2), - delivery-and-read(3), - ... -} - -END -- end of EmailPDU +-- ============================ +-- Description of the Email PDU +-- ============================ + +EmailPDU +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version18(18)} + +DEFINITIONS IMPLICIT TAGS ::= +BEGIN + +IMPORTS + + -- from ETSI TS 102 232-1 [3] + IPAddress + FROM LI-PS-PDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)} + + -- from ETSI TS 102 232-5 [38] + IPMMCC + FROM IPMultimediaPDU + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; + + +-- ============================ +-- Object Identifier Definition +-- ============================ + +emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} +emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} +emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} +messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} + + -- definitions are relative to + -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} + + +-- ============================= +-- Email Communications Contents +-- ============================= + +EmailCC ::= SEQUENCE + -- EmailCC is the PDU sent for each "piece" of E-mail captured content +{ + emailCCObjId [0] RELATIVE-OID, + email-Format [1] Email-Format, + content [2] OCTET STRING + -- Network byte order +} + +Email-Format ::= ENUMERATED +{ + ip-packet(1), + -- When this is the email format, the content will contain the bytes of the IP packet from + -- the IP header through to the end of the IP packet + -- Meets requirement E.2.7 + application(2) + -- Only the IP stack Layer 4 payload, (i.e. no IP or TCP headers) + -- Meets requirement E.2.8 +} + +-- ======================================= +-- Intercept-related information for Email +-- ======================================= + +EmailIRI ::= SEQUENCE + -- EmailIRI is the PDU sent for each "piece" of E-mail IRI +{ + emailIRIObjId [0] RELATIVE-OID, + eventType [1] E-mail-Event, + client-Address [2] IPAddress OPTIONAL, + -- Provided if available + server-Address [3] IPAddress OPTIONAL, + -- Provided if available + client-Port [4] INTEGER OPTIONAL, + -- Provided if available + server-Port [5] INTEGER OPTIONAL, + -- Provided if available + server-Octets-Sent [6] INTEGER, + client-Octets-Sent [7] INTEGER, + protocol-ID [8] E-mail-Protocol, + e-mail-Sender [9] UTF8String (SIZE (0..255)) OPTIONAL, + -- 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, + -- 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, + total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, + message-ID [13] OCTET STRING OPTIONAL, + -- Network byte order + nationalParameter [14] OCTET STRING OPTIONAL, + -- Completely defined on a national basis, including byte ordering + ..., + national-EM-ASN1parameters [15] National-EM-ASN1parameters OPTIONAL, + -- Completely defined on a national basis + aAAInformation [16] AAAInformation OPTIONAL, + e-mail-Sender-Validity [17] ENUMERATED + { + validated(0), + -- The operator has assured the e-mail-sender + nonvalidated(1), + -- The operator does not assure the e-mail-sender + ... + } OPTIONAL +} + +E-mail-Status ::= ENUMERATED +{ + status-unknown(1), + operation-failed(2), + operation-succeeded(3) +} + +E-mail-Event ::= ENUMERATED +{ + e-mail-send(1), + e-mail-receive(2), + e-mail-download(3), + ..., + e-mail-logon-attempt(4), + e-mail-logon(5), + e-mail-logon-failure(6), + e-mail-logoff(7), + e-mail-partial-download(8), + e-mail-upload(9) +} + +E-mail-Protocol ::= ENUMERATED +{ + smtp(1), + pop3(2), + imap4(3), + webmail(4), + -- See Annex H for more information + undefined(255), + -- The protocol is not known or not representable by the current enumeration + ... +} + +E-mail-Address-List ::= SEQUENCE (SIZE (0..1023)) OF UTF8String(SIZE (0..255)) + +National-EM-ASN1parameters ::= SEQUENCE +{ + countryCode [1] PrintableString (SIZE (2)), + -- Country Code according to ISO 3166-1 [12], + -- the country to which the parameters inserted after the extension marker apply + ... + -- In case a given country wants to use additional national parameters according to its law, + -- these national parameters should be defined using the ASN.1 syntax and added after the + -- extension marker (...) +} + +AAAInformation ::= CHOICE + -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information +{ + pOP3AAAInformation [0] POP3AAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, + ..., + iMAPAAAInformation [2] IMAPAAAInformation +} + +POP3AAAInformation ::= SEQUENCE + -- The POP3AAAInformation field contains the POP3 username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +ASMTPAAAInformation ::= SEQUENCE + -- The ASMTPAAAInformation field contains the SMTP username and + -- optionally the authentication fields +{ + username [0] UTF8String (SIZE (0..64)), + authMethod [1] AAAauthMethod OPTIONAL, + -- The hashing method used, i.e. CRAM-MD5, DIGEST-MD5, etc + challenge [2] OCTET STRING OPTIONAL, + -- A BASE64 encoded challenge send by the SMTP server + response [3] OCTET STRING OPTIONAL, + -- A BASE64 encoded hashed response returned by the client + aAAResult [4] AAAResult OPTIONAL, + ... +} + +IMAPAAAInformation ::= SEQUENCE + -- The iMAPAAAInformation field contains the IMAP username & optionally the password +{ + username [0] UTF8String (SIZE (0..64)), + password [1] UTF8String (SIZE (0..64)) OPTIONAL, + aAAResult [2] AAAResult OPTIONAL, + ... +} + +AAAResult ::= ENUMERATED +{ + resultUnknown(1), + aAAFailed(2), + aAASucceeded(3), + ... +} + +AAAauthMethod ::= ENUMERATED +{ + undefinedAuthMethod(1), + cramMD5(2), + digestMD5(3), + ... +} + +-- ================================= +-- Messaging Communications Contents +-- ================================= + +MessagingCC ::= SEQUENCE + -- MessagingCC is the PDU sent for the captured content +{ + messaging-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + sequence-number [3] INTEGER (0..4294967295) OPTIONAL, + end-of-sequence [4] BOOLEAN DEFAULT FALSE, + content-type [5] OCTET STRING, + -- MIME content type, i.e.: image/png, text/plain;charset=utf8, audio/PCMA + content [6] OCTET STRING, + ..., + content-transfer-encoding [7] OCTET STRING OPTIONAL + -- MIME Content-Transfer-Encoding mechanism. + -- Refer to IETF RFC 2045 [20] +} + + +MessagingMMCC ::= SEQUENCE + -- MessagingMMCC is the PDU sent for the captured IPMMCC content +{ + messaging-mm-cc-obj-id [0] RELATIVE-OID, + event-identifier [1] INTEGER (0..4294967295), + -- Used to correlate to MessagingIRI within the same CIN + content-identifier [2] INTEGER (0..4294967295) OPTIONAL, + content [3] IPMMCC, + ... +} + + +-- =========================================== +-- Intercept-related information for Messaging +-- =========================================== + +MessagingIRI ::= SEQUENCE +{ + messaging-iri-obj-id [0] RELATIVE-OID, + system-type [1] Messaging-System-Type, + system-identifier [2] OCTET STRING OPTIONAL, + -- Identifier up to national agreement, uniquely identifies a certain messaging system + category [3] Messaging-Event-Category OPTIONAL, + status [4] Messaging-Status, + party-information [5] SET OF Messaging-Party-Information OPTIONAL, + trigger [6] Messaging-Trigger, + properties [7] SEQUENCE OF Messaging-Property OPTIONAL, + event-identifier [8] INTEGER (0..4294967295) OPTIONAL, + -- Used to correlate to MessagingCC or MessagingMMCC within the same CIN. Mandatory when CC is also sent + original-message [9] OCTET STRING OPTIONAL, + ..., + box-identifier [10] OCTET STRING OPTIONAL +} + +Messaging-System-Type ::= ENUMERATED +{ + unified-messaging(1), + ... +} + +Messaging-Event-Category ::= CHOICE +{ + message [0] Messaging-Event, + message-box [1] Messaging-Box-Event, + message-notification [2] Messaging-Notification-Event, + call [3] Messaging-Call-Event, + ... +} + +Messaging-Event ::= ENUMERATED +{ + deposit(1), + retrieve(2), + delete(3), + save(4), + slamdown(5), + ..., + calendar(6), + contact(7) +} + +Messaging-Box-Event ::= ENUMERATED +{ + login(1), + logout(2), + lock(3), + unlock(4), + activate(5), + deactivate(6), + delete(7), + pin-change(8), + greeting-record(9), + greeting-change(10), + greeting-delete(11), + greeting-enable(12), + greeting-disable(13), + notification-enable(14), + notification-disable(15), + disconnect(16), + connect(17), + ..., + unknown(0), + greeting-play(18), + language-change(19), + pin-security-enable(20), + pin-security-disable(21), + personal-operator-add(22), + personal-operator-change(23), + personal-operator-remove(24), + additional-destination-add(25), + additional-destination-change(26), + additional-destination-remove(27), + auto-play-enable(28), + auto-play-disable(29), + header-play-enable(30), + header-play-disable(31) +} + +Messaging-Notification-Event ::= ENUMERATED +{ + sms(1), + sms-deposit(2), + sms-slamdown(3), + sms-pin-reminder(4), + email(5), + fax-to-email(6), + ..., + mms(7), + generic(8) +} + +Messaging-Call-Event ::= ENUMERATED +{ + callout(1), + ... +} + +Messaging-Status ::= ENUMERATED +{ + unknown(0), + not-applicable(1), + operation-failed(2), + operation-succeeded(3), + operation-cancelled(4), + operation-started(5), + ..., + operation-lost(6) +} + +Messaging-Party-Information ::= SEQUENCE +{ + party-qualifier [0] Messaging-Party-Qualifier, + party-identity [1] Messaging-Party-Identity, + ..., + party-validity [2] Messaging-Party-Validity OPTIONAL, + copy-qualifier [3] Messaging-Copy-Qualifier OPTIONAL +} + +Messaging-Party-Qualifier ::= ENUMERATED +{ + unknown-party(0), + -- In this case the party cannot be classified as either originating or terminating + originating-party(1), + -- In this case, the partyInformation parameter provides the identities related to + -- the originating party and all information provided by this party. + terminating-party(2), + -- In this case, the partyInformation parameter provides the identities related to + -- the terminating party and all information provided by this party. + ..., + associated-party(3) + -- In this case, the partyInformation parameter provides the identities related to + -- an associated party and all information provided by this party. +} + +Messaging-Party-Identity ::= CHOICE +{ + msisdn [0] OCTET STRING (SIZE (1..9)), + -- 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. + e164-format [1] OCTET STRING (SIZE (1..25)), + -- 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]) + 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, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), + -- 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. + -- It is described in 3GPP TS 23.003 [37] clause 2.2. + imei [7] OCTET STRING (SIZE (8)), + -- International Mobile Equipment 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. + -- It is defined in 3GPP TS 23.003 [37] clause 6. + fax-url [8] OCTET STRING, + -- see format defined in RFC 2806 [29]. + tel-url [9] OCTET STRING, + -- 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, + -- see format defined in RFC 2806 [29]. + sip-uri [11] OCTET STRING, + -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, + -- see format defined in RFC 3261 [32]. + nai [13] OCTET STRING + -- Network Access Identity of the party, encoded in the same format as used EPS + -- domain in 3GPP TS 33.108 [5] and defined in RFC 7542 [33]. +} + +IP-Address-And-Port ::= SEQUENCE +{ + ip-address [0] IPAddress, + -- IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + port-number [1] INTEGER, + -- port-number is defined by IETF RFC 6335 [35] + ... +} + +Messaging-Party-Validity ::= ENUMERATED +{ + unknown(0), + trusted(1), + untrusted(2), + ... +} + +Messaging-Copy-Qualifier ::= ENUMERATED +{ + unknown(0), + none(1), + cc(2), + bcc(3), + ... +} + +Messaging-Trigger ::= ENUMERATED +{ + unknown(0), + user(1), + user-agent(2), + system(3), + system-operator(4), + ... +} + +Messaging-Property ::= CHOICE +{ + pincode [0] OCTET STRING (SIZE (1..32)), + ..., + priority [1] Messaging-Property-Priority, + greeting-type [2] Messaging-Property-Greeting-Type, + notification-type [3] Messaging-Property-Notification-Type, + language [4] OCTET STRING, + -- Language according to RFC 4646 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, + user-agent [7] UTF8String, + password [8] OCTET STRING, + message-status [9] Messaging-Property-Message-Status, + requested-reports [10] Messaging-Property-Requested-Reports, + expires [11] GeneralizedTime, + message-date [12] GeneralizedTime +} + +Messaging-Property-Priority ::= ENUMERATED +{ + low(1), + medium(2), + high(3), + private(4), + ... +} + +Messaging-Property-Greeting-Type ::= ENUMERATED +{ + general(1), + name(2), + personal(3), + absence(4), + number(5), + ... +} + +Messaging-Property-Notification-Type ::= ENUMERATED +{ + empty-call(1), + lost-call(2), + ..., + message-to-email(3), + read-report(4), + delivery-report(5), + allow-delivery-report(6), + deny-delivery-report(7), + message-wait-indication(8), + voice-to-text(9), + new-message-sms(10), + new-message-outcall(11), + new-message-reminder(12) +} + +Messaging-Property-Message-Status ::= ENUMERATED +{ + indeterminate(0), + expired(1), + retrieved(2), + rejected(3), + deferred(4), + forwarded(5), + unrecognized(6), + unreachable(7), + read(8), + deleted-without-being-read(9), + delivery-condition-not-met(10), + ... +} + +Messaging-Property-Requested-Reports ::= ENUMERATED +{ + none(0), + delivery(1), + read(2), + delivery-and-read(3), + ... +} + +END -- end of EmailPDU \ No newline at end of file diff --git a/102232-2/portal/EmailPDU,ver17.txt b/102232-2/portal/EmailPDU,ver18.txt similarity index 79% rename from 102232-2/portal/EmailPDU,ver17.txt rename to 102232-2/portal/EmailPDU,ver18.txt index 881e769b4d32cda54fa6d9ca05a0c572f32db3ef..3487f53142dfd5486fa2e9cd07c58bdf27058b2e 100644 --- a/102232-2/portal/EmailPDU,ver17.txt +++ b/102232-2/portal/EmailPDU,ver18.txt @@ -1,17 +1,21 @@ +-- ============================ +-- Description of the Email PDU +-- ============================ + 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 ::= BEGIN IMPORTS - -- from TS 102 232-1 [3] + -- from ETSI TS 102 232-1 [3] IPAddress FROM LI-PS-PDU {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 FROM IPMultimediaPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version8(8)}; @@ -21,11 +25,12 @@ IMPORTS -- Object Identifier Definition -- ============================ -emailIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) iRI(1)} -emailCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) cC(2)} -messagingIRIObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingIRI(3)} -messagingCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingCC(4)} -messagingMMCCObjId RELATIVE-OID ::= {li-ps(5) email(2) version17(17) messagingMMCC(5)} +emailPDUObjId RELATIVE-OID ::= {li-ps(5) email(2) version18(18)} +emailIRIObjId RELATIVE-OID ::= {emailPDUObjId iRI(1)} +emailCCObjId RELATIVE-OID ::= {emailPDUObjId cC(2)} +messagingIRIObjId RELATIVE-OID ::= {emailPDUObjId messagingIRI(3)} +messagingCCObjId RELATIVE-OID ::= {emailPDUObjId messagingCC(4)} +messagingMMCCObjId RELATIVE-OID ::= {emailPDUObjId messagingMMCC(5)} -- definitions are relative to -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)} @@ -76,9 +81,11 @@ EmailIRI ::= SEQUENCE client-Octets-Sent [7] INTEGER, protocol-ID [8] E-mail-Protocol, 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, - -- 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, total-Recipient-Count [12] INTEGER (0..4294967295) OPTIONAL, message-ID [13] OCTET STRING OPTIONAL, @@ -149,7 +156,7 @@ AAAInformation ::= CHOICE -- The AAAInformation field allows for POP3 and authenticated SMTP AAA information { pOP3AAAInformation [0] POP3AAAInformation, - aSMTPAAAInformation [1] ASMTPAAAInformation, + aSMTPAAAInformation [1] ASMTPAAAInformation, ..., iMAPAAAInformation [2] IMAPAAAInformation } @@ -210,7 +217,7 @@ AAAauthMethod ::= ENUMERATED MessagingCC ::= SEQUENCE -- 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), -- Used to correlate to MessagingIRI within the same CIN content-identifier [2] INTEGER (0..4294967295) OPTIONAL, @@ -225,6 +232,7 @@ MessagingCC ::= SEQUENCE -- Refer to IETF RFC 2045 [20] } + MessagingMMCC ::= SEQUENCE -- MessagingMMCC is the PDU sent for the captured IPMMCC content { @@ -306,8 +314,7 @@ Messaging-Box-Event ::= ENUMERATED disconnect(16), connect(17), ..., - unknown(0), - + unknown(0), greeting-play(18), language-change(19), pin-security-enable(20), @@ -317,7 +324,11 @@ Messaging-Box-Event ::= ENUMERATED personal-operator-remove(24), additional-destination-add(25), 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 @@ -357,7 +368,7 @@ Messaging-Party-Information ::= SEQUENCE party-identity [1] Messaging-Party-Identity, ..., 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 @@ -372,52 +383,54 @@ Messaging-Party-Qualifier ::= ENUMERATED -- the terminating party and all information provided by this party. ..., associated-party(3) - -- In this case, the partyInformation parameter provides the identites related to - -- an associated party and all information provided by this party + -- In this case, the partyInformation parameter provides the identities related to + -- an associated party and all information provided by this party. } 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 -- 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 -- 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, - --IPAddress is defined by IETF RFC 791 [31] and RFC 2460 [34] - alphanumeric [4] UTF8String, - ip-address-and-port [5] IP-Address-And-Port, - imsi [6] OCTET STRING (SIZE (3..8)), + ip-address [3] IPAddress, + –-IPAddress is defined by IETF RFC 791 [31] and RFC 8200 [34] + alphanumeric [4] UTF8String, + ip-address-and-port [5] IP-Address-And-Port, + imsi [6] OCTET STRING (SIZE (3..8)), -- 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. -- 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 - -- TBCD-STRING parameter defined in MAP format 3GPP TS 23.003 [37] clause 6 - fax-url [8] OCTET STRING, + -- TBCD-STRING parameter defined in MAP format 3GPP TS 29.002 [36], clause 17.7.8. + –- It is defined in 3GPP TS 23.003 [37] clause 6. + fax-url [8] OCTET STRING, -- see format defined in RFC 2806 [29]. - tel-url [9] OCTET STRING, - -- see format used in TS 133.108 [5], TS 24 229[30] and defined in RFC 2806 [29]. - modem-url [10] OCTET STRING, + tel-url [9] OCTET STRING, + -- 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, -- see format defined in RFC 2806 [29]. - sip-uri [11] OCTET STRING, - -- see format used in in TS 133.108 [5] and defined in RFC 3261 [32]. - sips-uri [12] OCTET STRING, + sip-uri [11] OCTET STRING, + -- see format used in in 3GPP TS 33.108 [5] and defined in RFC 3261 [32]. + sips-uri [12] OCTET STRING, -- 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 - -- 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 [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 is defined by IETF RFC 6533 [35] + –- port-number is defined by IETF RFC 6335 [35] ... } @@ -438,7 +451,6 @@ Messaging-Copy-Qualifier ::= ENUMERATED ... } - Messaging-Trigger ::= ENUMERATED { unknown(0), @@ -457,9 +469,9 @@ Messaging-Property ::= CHOICE greeting-type [2] Messaging-Property-Greeting-Type, notification-type [3] Messaging-Property-Notification-Type, language [4] OCTET STRING, - -- Language according to RFC 3066 [24] - message-identifier [5] OCTET STRING, - subject [6] UTF8String, + -- Language according to RFC 4646 [24] + message-identifier [5] OCTET STRING, + subject [6] UTF8String, user-agent [7] UTF8String, password [8] OCTET STRING, message-status [9] Messaging-Property-Message-Status, @@ -498,7 +510,10 @@ Messaging-Property-Notification-Type ::= ENUMERATED allow-delivery-report(6), deny-delivery-report(7), 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 diff --git a/103120/dictionaries/ts_103120_Dictionaries.xsd b/103120/dictionaries/ts_103120_Dictionaries.xsd index a5e9b664029ccf192621eafb6433bf373e3988ec..5d307ce364ad509eff8c44bc33cab45b08e5cb76 100644 --- a/103120/dictionaries/ts_103120_Dictionaries.xsd +++ b/103120/dictionaries/ts_103120_Dictionaries.xsd @@ -29,4 +29,3 @@ - diff --git a/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010901p0_Dictionaries.xsd similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd rename to 103120/portal/dictionaries/ts_103120v010901p0_Dictionaries.xsd diff --git a/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010901p0_ETSIDictionaryDefinitions.xml similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/dictionaries/ts_103120v010901p0_ETSIDictionaryDefinitions.xml diff --git a/103120/portal/examples/example.key b/103120/portal/examples/example.key new file mode 100644 index 0000000000000000000000000000000000000000..b5959e7f2fa859401c0543f1038599b31600b37c --- /dev/null +++ b/103120/portal/examples/example.key @@ -0,0 +1,28 @@ +-----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----- diff --git a/103120/portal/examples/example.pem b/103120/portal/examples/example.pem new file mode 100644 index 0000000000000000000000000000000000000000..2aa1eaca4fc4ca1cb9d727356fefedb84b9dfade --- /dev/null +++ b/103120/portal/examples/example.pem @@ -0,0 +1,19 @@ +-----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 +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV +-----END CERTIFICATE----- diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml index 5e5f226800ba796c704d3f2075b837b783dc7cb1..2b8ec478874a7fbdaca0d7a81af8602966386f0f 100644 --- a/103120/portal/examples/mutliple-auth-example-request.xml +++ b/103120/portal/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.8.1 + V1.9.1 XX v1.1.1 diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index e8b6a5f8b113cfebe8e5f05f6aee82752fbc0184..84ad5c99406501d40a591fa8d157becc4ca773b3 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 67cbefd85d9617fe8c574c0bd449694b2dbcdc8f..7daae44b722b0d4cc31b07d84899c212b42c4e73 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index 5da0df382bc54aab96d7a577222fcc449c0fe42b..714741b6186b99f7571cea30db9dc0948b251e4c 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index 555974f0a91b1cda95c0ec060fd6d75bf278de9f..48cb79de1c09d6f86f10e3591c7928e4a3c94021 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index 7d5170752e0475762923ed6fbdcc9282801b8114..49b3ef3c78fee2f86ca3a1458e2e05f48d821f3f 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index f9314cdd3f3719b3d67dd0ba88122e0071a905d4..afefbec99b0adbfcf28446b8d3d4ad1ed4c1cfea 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/request6.xml b/103120/portal/examples/request6.xml new file mode 100644 index 0000000000000000000000000000000000000000..7fb40189617c0b60048a0ae8f8da899f28c3a6fa --- /dev/null +++ b/103120/portal/examples/request6.xml @@ -0,0 +1,82 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + diff --git a/103120/portal/examples/request6_signed.xml b/103120/portal/examples/request6_signed.xml new file mode 100644 index 0000000000000000000000000000000000000000..2bc0404ef924498e7280669c399ac4c430873787 --- /dev/null +++ b/103120/portal/examples/request6_signed.xml @@ -0,0 +1,118 @@ + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:00.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + + 68c78910-c922-45f2-aeb3-017eb958bb05 + XX + ACTOR01 + W000001 + + 2021-06-25T12:00:00Z + 2021-09-01T12:00:00Z + + + + + + 1 + + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + XX + ACTOR01 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + LIID1 + + + + + ETSI + InternationalizedEmailAddress + + Όνομα.παραδείγματος@example.com + + + + + ETSI + TaskDeliveryType + IRIandCC + + + + + 192.0.2.0 + + + + + XX + RECVER01 + + + + + + + + + + + + + + + + + + kARbaz+wH6oJWSvmy6Fk4vTQ7t4m3Y16IiNNdDO08/I= + + + DdT9ie03Z9O47sN8ad9gsfuhZhchtNhtvTyNhtiHKuqgNCt696tDH2c68tVqr+iJ3WpCn0gWJHKnYeniTwVPj6fxDh2RbCqk5SVHvdggZjCv3BInNH0ZfOrlvuArJS3UP/gifYXlT5s59Seze1nSjZDNeC25o9WRxNy0krGrhbqIFjxTHDilR40cmKq2SI1540yM3rsc+5D3hgsxGu7ly2dg7qtiFGQIQaFJi8twrViQUnOyDZ63yJHhWeLVU+2FvIuBZh3orDc3VipKsbqrjrDqdfi8qfYEHHPp25DfTpHXnCuhD/3hOwcxvhVJ4+47R8ysO9qMTvGRCUNptgskhQ== + + + 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 +70YW8msIEt1mljDi4CBI+MvaJ40OJkXwkQUE3dhj9LJl5Nv0UBEyv7k/a/6+eO9K +OQoHIVqXwrWs9JHTW6T4diN1w7xcgvSXhlcOySHjfNzFzferqx8i0/Wz6jD/7YSC +FOEaUrXbeFS3asRoZRLW6uXgfDJ7qfCmUZZ853OF3MN63OwWjPGxtFmeZAqMS/K0 +FKgwMCrmZlVq6Fx87E+sc3eppXIceCau/+CHG91mRvMSha6jQD7jLMT9xjND5Dob +/scV + + + + + \ No newline at end of file diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index 25aa22c9fee5e4873142b34d7aff30c82e25021e..e4faf001bb4bfb076a5dbc60aa05506e654c74dc 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 9ae5d35a80a58d747f995357752a222cdb41cd5d..0675cb2be88d5ea428fc7956797838cb2f0216cf 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index e3b1537dce4c53c395ef3c1adc6090af76661793..2412b1848adeb8dd33a470ded748ee24a080bffc 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index a8dc811c0046124966418f8127ad3b8affd9f312..a7f9e94bab1cc8c0777854d932ae255c4d3b5519 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index e210444e8a85f4dab6b4e2e9a593c551db3b8596..336c29fd84dfac0dd8b1a1ac2dda60954c8d7898 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.8.1 + V1.9.1 XX v1.0 diff --git a/103120/portal/examples/response6.xml b/103120/portal/examples/response6.xml new file mode 100644 index 0000000000000000000000000000000000000000..3656eeb094d4eece2047e86044e739f4628d1ad8 --- /dev/null +++ b/103120/portal/examples/response6.xml @@ -0,0 +1,38 @@ + + +
+ + XX + ACTOR01 + + + XX + ACTOR02 + + 9964584e-c1a5-4ffa-b949-d9da504c4efb + 2021-06-25T12:00:01.000000Z + + V1.9.1 + XX + v1.0 + +
+ + + + + 0 + + 68c78910-c922-45f2-aeb3-017eb958bb05 + + + + 1 + + 4d8127db-e8bc-4a69-9378-457f0424ec2c + + + + + + diff --git a/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010901p0_Authorisation.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010901p0_Authorisation.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Common.xsd b/103120/portal/schema/ts_103120v010901p0_Common.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Common.xsd rename to 103120/portal/schema/ts_103120v010901p0_Common.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Core.xsd b/103120/portal/schema/ts_103120v010901p0_Core.xsd similarity index 96% rename from 103120/portal/schema/ts_103120v010801p0_Core.xsd rename to 103120/portal/schema/ts_103120v010901p0_Core.xsd index da3bc564ad4567ecfede36c7e8d83940d7e6b6e6..af1674ddfe45821634245197ebb7491779493078 100644 --- a/103120/portal/schema/ts_103120v010801p0_Core.xsd +++ b/103120/portal/schema/ts_103120v010901p0_Core.xsd @@ -2,6 +2,7 @@ + @@ -16,6 +18,8 @@ + + diff --git a/103120/portal/schema/ts_103120v010801p0_Delivery.xsd b/103120/portal/schema/ts_103120v010901p0_Delivery.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010901p0_Delivery.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Document.xsd b/103120/portal/schema/ts_103120v010901p0_Document.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Document.xsd rename to 103120/portal/schema/ts_103120v010901p0_Document.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Notification.xsd b/103120/portal/schema/ts_103120v010901p0_Notification.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010901p0_Notification.xsd diff --git a/103120/portal/schema/ts_103120v010801p0_Task.xsd b/103120/portal/schema/ts_103120v010901p0_Task.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010801p0_Task.xsd rename to 103120/portal/schema/ts_103120v010901p0_Task.xsd diff --git a/103120/schema/ts_103120_Core.xsd b/103120/schema/ts_103120_Core.xsd index da3bc564ad4567ecfede36c7e8d83940d7e6b6e6..af1674ddfe45821634245197ebb7491779493078 100644 --- a/103120/schema/ts_103120_Core.xsd +++ b/103120/schema/ts_103120_Core.xsd @@ -2,6 +2,7 @@ + @@ -16,6 +18,8 @@ + + diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 2cf5206327d992c5f46c749e1cbc4b176f61e05b..d06eb9f7c823c5e9602d2c50f4346ae2002edca1 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -154,6 +154,7 @@ + @@ -251,6 +252,7 @@ + @@ -787,4 +789,4 @@ - + \ No newline at end of file diff --git a/103221-1/portal/TS_103_221_01_v010801.xsd b/103221-1/portal/TS_103_221_01_v010901.xsd similarity index 99% rename from 103221-1/portal/TS_103_221_01_v010801.xsd rename to 103221-1/portal/TS_103_221_01_v010901.xsd index 2cf5206327d992c5f46c749e1cbc4b176f61e05b..4fc4676556bd8d49f0176c9b4c0180ab8dc031aa 100644 --- a/103221-1/portal/TS_103_221_01_v010801.xsd +++ b/103221-1/portal/TS_103_221_01_v010901.xsd @@ -154,6 +154,7 @@ + @@ -251,6 +252,7 @@ + diff --git a/103280/TS_103_280.asn1 b/103280/TS_103_280.asn1 index 68cfe54e9a3e75ef0565bd50cd1c0d4bdbc8793f..c7b31a63158c6023395cf62e69e52651c8c63d5b 100644 --- a/103280/TS_103_280.asn1 +++ b/103280/TS_103_280.asn1 @@ -91,4 +91,4 @@ GPSINAI ::= NAI NAI ::= UTF8String -END +END \ No newline at end of file diff --git a/103280/TS_103_280.xsd b/103280/TS_103_280.xsd index e5c0bdea3682e1962175e2c84bd36a09a20ae821..ce66ea6e07a51b9b1870ce32eb95d2c09eba3720 100644 --- a/103280/TS_103_280.xsd +++ b/103280/TS_103_280.xsd @@ -1,5 +1,5 @@ - + @@ -236,4 +236,9 @@ - + + + + + + \ No newline at end of file diff --git a/103280/portal/TS_103_280_v020401.xsd b/103280/portal/TS_103_280_v020601.xsd similarity index 97% rename from 103280/portal/TS_103_280_v020401.xsd rename to 103280/portal/TS_103_280_v020601.xsd index e5c0bdea3682e1962175e2c84bd36a09a20ae821..e78066065c09c8910e83fcd0f9ea3f137bfa7b96 100644 --- a/103280/portal/TS_103_280_v020401.xsd +++ b/103280/portal/TS_103_280_v020601.xsd @@ -1,5 +1,5 @@ - + @@ -236,4 +236,9 @@ + + + + + diff --git a/103707/TS_103_707.xsd b/103707/TS_103_707.xsd index 2f33c569b42114734d1e647b80e05f507b577a8e..b5033684b8ffdf1a460fc35f10c1712427910c33 100644 --- a/103707/TS_103_707.xsd +++ b/103707/TS_103_707.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.1.1" + version="1.3.1" elementFormDefault="qualified"> @@ -13,13 +13,20 @@ - + + + + + + + + diff --git a/103707/portal/TS_103_707_v010201.xsd b/103707/portal/TS_103_707_v010301.xsd similarity index 95% rename from 103707/portal/TS_103_707_v010201.xsd rename to 103707/portal/TS_103_707_v010301.xsd index 2f33c569b42114734d1e647b80e05f507b577a8e..b5033684b8ffdf1a460fc35f10c1712427910c33 100644 --- a/103707/portal/TS_103_707_v010201.xsd +++ b/103707/portal/TS_103_707_v010301.xsd @@ -3,7 +3,7 @@ xmlns:etsi103280="http://uri.etsi.org/03280/common/2017/07" xmlns="http://uri.etsi.org/03707/2020/02" targetNamespace="http://uri.etsi.org/03707/2020/02" - version="1.1.1" + version="1.3.1" elementFormDefault="qualified"> @@ -13,13 +13,20 @@ - + + + + + + + + diff --git a/103707/portal/examples/example_multiple_items.xml b/103707/portal/examples/example_multiple_items.xml new file mode 100644 index 0000000000000000000000000000000000000000..6913c2ba2d454193c7f5c95df3500df657f849b1 --- /dev/null +++ b/103707/portal/examples/example_multiple_items.xml @@ -0,0 +1,75 @@ + + + + +
+ + + + + target@example.com + + true + + + + + someoneelse@example.com + + + + 2021-06-17T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + +
+ + + + + someoneelse@example.com + + + + + + target@example.com + + true + + + 2021-06-18T06:42:23.000000+01:00 + + + + + http://FooServiceSchema.example.com/schema/v1.1.1/ + + + + Foo + Bar + Baz + + + + + + + + diff --git a/103707/portal/testing/validate_examples.py b/103707/portal/testing/validate_examples.py index fbcf21f25063b68e8ac31479b7f0978a70c31b9e..82d6df71cc7585b63d0dafbb5ab03d2691c81a51 100644 --- a/103707/portal/testing/validate_examples.py +++ b/103707/portal/testing/validate_examples.py @@ -1,5 +1,6 @@ import glob import sys +import argparse from pathlib import Path from pprint import pprint @@ -21,7 +22,7 @@ if __name__ == '__main__': extraSchemas = [ 'examples/FooServiceSchema.xsd', - 'TS_103_280_v020301.xsd' + 'TS_103_280_v020401.xsd' ] locations = [] @@ -29,7 +30,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010301.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema) diff --git a/testing/compile_asn.py b/testing/compile_asn.py index 33fea5041594629305d98224885f88b95f077fd7..e291e42d4077915416bbabba5be97db1cbb7ed50 100644 --- a/testing/compile_asn.py +++ b/testing/compile_asn.py @@ -83,7 +83,7 @@ def compileASN1Files (fileList): fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-1', 'TS101909201', 'CTTRAFFIC') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'tTRAFFIC-2', 'TS101909202', 'TTRAFFIC') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cTTRAFFIC-2', 'TS101909202', 'CTTRAFFIC') - fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') + #fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'cCIPPacketHeader', 'CDMA2000CCModule', 'CCIPPacketHeader') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'uMTSCC-CC-PDU', 'Umts-HI3-PS', 'CC-PDU') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'ePSCC-CC-PDU', 'Eps-HI3-PS', 'CC-PDU') fixDottedReference(dr, 'LI-PS-PDU', 'CCContents', 'confCC-CC-PDU', 'CONF-HI3-IMS', 'Conf-CC-PDU') @@ -93,8 +93,8 @@ def compileASN1Files (fileList): fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-1', 'TS101909201', 'TARGETACTIVITYMONITOR-1') fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'tARGETACTIVITYMONITOR-2', 'TS101909202', 'TARGETACTIVITYMONITOR') - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') - fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') + #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'lAESProtocol', 'Laesp-j-std-025-b', 'LAESProtocol') + #fixDottedReference(dr, 'LI-PS-PDU', 'IRIContents', 'cDMA2000LAESMessage', 'CDMA2000CIIModule', 'CDMA2000LAESMessage') fixDottedReference(dr, 'LI-PS-PDU', 'HI4Payload', 'threeGPP-LI-Notification', 'TS33128Payloads', 'LINotificationPayload')