diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index e8b6eedb2dcfde2b5c02450ed79ac1417d4a47e6..c85780833ebbe414989464aae34003e9ff785326 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -41,7 +41,7 @@ IMPORTS IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} -- from ETSI TS 102 232-4 [32] L2CC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -62,7 +62,7 @@ IMPORTS FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, CorrelationValues, @@ -72,7 +72,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsCS-IRIsContent FROM UmtsCS-HI2Operations @@ -80,7 +80,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, EpsIRIsContent, EPSLocation @@ -89,7 +89,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations @@ -97,7 +97,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ProSeIRIsContent FROM ProSeHI2Operations @@ -105,7 +105,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, GcseIRIsContent FROM GCSEHI2Operations @@ -113,42 +113,42 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CC-PDU FROM Umts-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CC-PDU FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Conf-CC-PDU FROM CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Voip-CC-PDU FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Gcse-CC-PDU FROM GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] ThreeGPP-HI1-Operation FROM ThreeGPP-HI1NotificationOperations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} @@ -159,13 +159,13 @@ IMPORTS -- The implementation depends of national regulations or LEA/CSP negotiations. -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CSvoice-CC-PDU - FROM CSvoice-HI3-IP + FROM CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9]. + -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9]. -- from ETSI TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -205,7 +205,7 @@ IMPORTS FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -239,7 +239,7 @@ PSHeader ::= SEQUENCE timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, timeStampQualifier [8] TimeStampQualifier OPTIONAL @@ -253,12 +253,12 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, + encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] iLHIPayload [6] SEQUENCE OF ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] - hI4Payload [7] SEQUENCE OF HI4Payload + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -336,28 +336,28 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, ..., - l2CC [6] L2CC, - tTRAFFIC-1 [7] TS101909201.TTRAFFIC, - cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, - tTRAFFIC-2 [9] TS101909202.TTRAFFIC, - cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, - pstnIsdnCC [11] PstnIsdnCC, - iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING, - uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, - messagingMMCC [18] MessagingMMCC, - confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, - voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, - gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) + l2CC [6] L2CC, + tTRAFFIC-1 [7] TS101909201.TTRAFFIC, + cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, + tTRAFFIC-2 [9] TS101909202.TTRAFFIC, + cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, + pstnIsdnCC [11] PstnIsdnCC, + iPMMCC [12] IPMMCC, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC, + confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, + voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) } MicroSecondTimeStamp ::= SEQUENCE @@ -423,7 +423,7 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) } UMTSIRI ::= CHOICE @@ -515,7 +515,7 @@ IntegrityCheck ::= SEQUENCE -- Network byte order -- If checkValue contains a signature, the octet string field space may be -- used to insert the appropriate ASN.1 DER or BER encoded structure for the - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL -- Clarifies the hash function if checkType is hash(1). diff --git a/102232-1/portal/LI-PS-PDU,ver30.txt b/102232-1/portal/LI-PS-PDU,ver31.txt similarity index 91% rename from 102232-1/portal/LI-PS-PDU,ver30.txt rename to 102232-1/portal/LI-PS-PDU,ver31.txt index 6def9ef41abb49dbb2822b8705affa36cfb6617f..c85780833ebbe414989464aae34003e9ff785326 100644 --- a/102232-1/portal/LI-PS-PDU,ver30.txt +++ b/102232-1/portal/LI-PS-PDU,ver31.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) version30(30)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} DEFINITIONS IMPLICIT TAGS ::= @@ -41,7 +41,7 @@ IMPORTS IPIRI, IPIRIOnly FROM IPAccessPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} -- from ETSI TS 102 232-4 [32] L2CC, @@ -54,7 +54,7 @@ IMPORTS IPMMCC, IPMMIRI FROM IPMultimediaPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version10(10)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -62,7 +62,7 @@ IMPORTS FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, CorrelationValues, @@ -72,7 +72,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsCS-IRIsContent FROM UmtsCS-HI2Operations @@ -80,7 +80,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, EpsIRIsContent, EPSLocation @@ -89,7 +89,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations @@ -97,7 +97,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, ProSeIRIsContent FROM ProSeHI2Operations @@ -105,7 +105,7 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] IRI-Parameters, GcseIRIsContent FROM GCSEHI2Operations @@ -113,42 +113,42 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CC-PDU FROM Umts-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3(2)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CC-PDU FROM Eps-HI3-PS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3eps(9)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Conf-CC-PDU FROM CONF-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3conf(11)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Voip-CC-PDU FROM VoIP-HI3-IMS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3voip(12)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] Gcse-CC-PDU FROM GCSE-HI3 {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2) threeGPP(4) hi3gcse(14)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] ThreeGPP-HI1-Operation FROM ThreeGPP-HI1NotificationOperations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi1(0) notificationOperations(1)} @@ -159,13 +159,13 @@ IMPORTS -- The implementation depends of national regulations or LEA/CSP negotiations. -- 3GPP HI1 may be used with other services/networks than 3GPP's one. - -- from ETSI TS 133 108 [9] + -- from 3GPP TS 33.108 [9] CSvoice-CC-PDU - FROM CSvoice-HI3-IP + FROM CSvoice-HI3-IP {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi3CSvoice(18)} -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- The implementation of the CS domain delivery in IP have to be based on ETSI TS 133 108 [9]. + -- The implementation of the CS domain delivery in IP have to be based on 3GPP TS 33.108 [9]. -- from ETSI TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -199,11 +199,13 @@ IMPORTS -- This import is only used for the handover between LEMFs. -- from 3GPP TS 33.128 [46] - LINotificationPayload + LINotificationPayload, + IRIPayload, + CCPayload FROM TS33128Payloads {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) ts33128(19)}; -- The relevant module (including the 3GPP release and version number) - -- needs to be chosen when compiling the application. + -- needs to be chosen when compiling the application. -- end of IMPORTS @@ -213,7 +215,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) version30(30)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version31(31)} -- ==================== -- Top-level definition @@ -237,7 +239,7 @@ PSHeader ::= SEQUENCE timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 ..., - interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, + interceptionPointID [6] PrintableString (SIZE (1..8)) OPTIONAL, -- see clause 5.2.11 microSecondTimeStamp [7] MicroSecondTimeStamp OPTIONAL, timeStampQualifier [8] TimeStampQualifier OPTIONAL @@ -251,12 +253,12 @@ Payload ::= CHOICE tRIPayload [2] TRIPayload, ..., hI1-Operation [3] HI1-Operation, - encryptionContainer [4] EncryptionContainer, + encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation, -- This structure may be functionally redundant with hI1-Operation from ETSI TS 101 671 [4] iLHIPayload [6] SEQUENCE OF ILHIPayload, -- For typical use cases see ETSI TS 103 462 [45] - hI4Payload [7] SEQUENCE OF HI4Payload + hI4Payload [7] SEQUENCE OF HI4Payload } TimeStampQualifier ::= ENUMERATED @@ -270,7 +272,7 @@ TimeStampQualifier ::= ENUMERATED HI4Payload ::= CHOICE { - threeGPP-LI-Notification [1] TS33128Payloads.LiNotificationPayload, + threeGPP-LI-Notification [1] TS33128Payloads.LINotificationPayload, ... } @@ -334,28 +336,29 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - emailCC [1] EmailCC, - iPCC [2] IPCC, - uMTSCC [4] OCTET STRING, + emailCC [1] EmailCC, + iPCC [2] IPCC, + uMTSCC [4] OCTET STRING, ..., - l2CC [6] L2CC, - tTRAFFIC-1 [7] TS101909201.TTRAFFIC, - cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, - tTRAFFIC-2 [9] TS101909202.TTRAFFIC, - cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, - pstnIsdnCC [11] PstnIsdnCC, - iPMMCC [12] IPMMCC, - cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING, - uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, - ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, - messagingMMCC [18] MessagingMMCC, - confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, - voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, - gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, - cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, - threeGPP33128DefinedCC [23] OCTET STRING } + l2CC [6] L2CC, + tTRAFFIC-1 [7] TS101909201.TTRAFFIC, + cTTRAFFIC-1 [8] TS101909201.CTTRAFFIC, + tTRAFFIC-2 [9] TS101909202.TTRAFFIC, + cTTRAFFIC-2 [10] TS101909202.CTTRAFFIC, + pstnIsdnCC [11] PstnIsdnCC, + iPMMCC [12] IPMMCC, + cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING, + uMTSCC-CC-PDU [16] Umts-HI3-PS.CC-PDU, + ePSCC-CC-PDU [17] Eps-HI3-PS.CC-PDU, + messagingMMCC [18] MessagingMMCC, + confCC-CC-PDU [19] CONF-HI3-IMS.Conf-CC-PDU, + voipCC-CC-PDU [20] VoIP-HI3-IMS.Voip-CC-PDU, + gcseCC-CC-PDU [21] GCSE-HI3.Gcse-CC-PDU, + cSvoice-CC-PDU [22] CSvoice-HI3-IP.CSvoice-CC-PDU, + threeGPP33128DefinedCC [23] OCTET STRING (CONTAINING TS33128Payloads.CCPayload) +} MicroSecondTimeStamp ::= SEQUENCE { @@ -420,7 +423,8 @@ IRIContents ::= CHOICE confIRI [16] ConfIRI, proseIRI [17] ProSeIRI, gcseIRI [18] GcseIRI, - threeGPP33128DefinedIRI [19] OCTET STRING} + threeGPP33128DefinedIRI [19] OCTET STRING (CONTAINING TS33128Payloads.IRIPayload) +} UMTSIRI ::= CHOICE -- This structure may be commented out if not used @@ -511,7 +515,7 @@ IntegrityCheck ::= SEQUENCE -- Network byte order -- If checkValue contains a signature, the octet string field space may be -- used to insert the appropriate ASN.1 DER or BER encoded structure for the - -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. + -- DSS/DSA signature as described in IETF RFC 3279 [43], clause 2.2.2. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL -- Clarifies the hash function if checkType is hash(1). diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 2461f42b953c35fe46ac3b864766af5c1364062f..b57655781de7ed4a5cb09b84cd4b7ead37931d5e 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -5,9 +5,8 @@ DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS - -- from ETSI TS 102 232-1 [2] - IPAddress, + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -17,12 +16,13 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} -iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} -iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} - -- all four definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} +iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} +iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} + -- all four definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + -- ========================== -- IP Communications Contents @@ -55,12 +55,12 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCII characters + -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, -- IP address may not be available in case of failed logon attempts. - -- If it is available, it shall be sent. + -- If it is available, it must be sent. -- This field will carry the first IPv4 or IPv6 target IP address with or without -- subnet. Use of this field is fully described in section 6.2.1. targetNetworkID [5] UTF8String (SIZE (1..20)) OPTIONAL, @@ -114,7 +114,9 @@ IPIRIContents ::= SEQUENCE -- This field will carry the NAS-Port-ID as defined in RFC 2869 [17]: -- This parameter shall be populated with the RADIUS value. framedRoutes [26] SEQUENCE OF FramedRoute OPTIONAL - -- It is used to list all the available Framed Route and Framed IPv6 Route informationX + -- It is used to list all the available Framed Route and Framed IPv6 Route information + + } AccessEventType ::= ENUMERATED @@ -141,7 +143,6 @@ AccessEventType ::= ENUMERATED endOfInterceptionWithSessionActive(9), -- LI is ended on a target who still has an active session unknown(10) - } InternetAccessType ::= ENUMERATED @@ -200,7 +201,7 @@ IPIRIIDType ::= CHOICE printableIDType [0] UTF8String (SIZE (1..128)), -- For printable userIDs, such as the Radius username, phonenumbers macAddressType [1] OCTET STRING (SIZE (6)), - -- For MAC address types, raw binary format as in IETF RFC 2132 [15] + -- For MAC address types, raw binary format as in RFC 2132 [15] ipAddressType [2] IPAddress, -- For IP address types ... @@ -242,13 +243,12 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from ETSI TS 102 232 [2]. + -- IPAddress imported from TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... } - FramedRoute ::= CHOICE { -- Additional Framed Route prefix information associated with the target service @@ -270,11 +270,11 @@ IPIRIOnly ::= SEQUENCE { iPIRIOnlyObjId [0] RELATIVE-OID, iPInformation [1] IPInformation, - protocolInformation [2] ProtocolInformation, + protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, - pDSRInformation [5] PDSRInformation OPTIONAL, - ... + ..., + pDSRInformation [5] PDSRInformation OPTIONAL } IPInformation ::= CHOICE @@ -344,24 +344,24 @@ UDPInformation ::= SEQUENCE PDSRInformation::= SEQUENCE { - summaryTrigger [0] PDSRSummaryTrigger, - firstPacketTimestamp [1] GeneralizedTime, - lastPacketTimestamp [2] GeneralizedTime, - packetCount [3] INTEGER, - byteCount [4] INTEGER, - ... + summaryTrigger [0] PDSRSummaryTrigger, + firstPacketTimestamp [1] GeneralizedTime, + lastPacketTimestamp [2] GeneralizedTime, + packetCount [3] INTEGER, + byteCount [4] INTEGER, + ... } PDSRSummaryTrigger ::= ENUMERATED { - startOfFlow(0), - timerExpiry(1), - packetCount(2), - byteCount(3), - endOfFlow(4), - ... + startOfFlow(0), + timerExpiry(1), + packetCount(2), + byteCount(3), + endOfFlow(4), + ... } - END -- end of IPAccessPDU + diff --git a/102232-3/portal/IPAccessPDU,ver13.txt b/102232-3/portal/IPAccessPDU,ver14.txt similarity index 91% rename from 102232-3/portal/IPAccessPDU,ver13.txt rename to 102232-3/portal/IPAccessPDU,ver14.txt index e4813de50d32b0620b5624e6c05c778e938d2c36..b57655781de7ed4a5cb09b84cd4b7ead37931d5e 100644 --- a/102232-3/portal/IPAccessPDU,ver13.txt +++ b/102232-3/portal/IPAccessPDU,ver14.txt @@ -1,12 +1,12 @@ IPAccessPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version14(14)} DEFINITIONS IMPLICIT TAGS ::= BEGIN IMPORTS -- from ETSI TS 102 232-1 [2] - IPAddress + IPAddress, Location FROM LI-PS-PDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version26(26)}; @@ -16,11 +16,13 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPIRIObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRI(1)} -iPCCObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) cC(2)} -iPIRIOnlyObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version13(13) iRIOnly(3)} - -- all three definitions relative to {itu-t(0) identified-organization(4) - -- etsi(0) securityDomain(2) lawfulintercept(2)} +iPAccessPDUObjId RELATIVE-OID ::= {li-ps(5) iPAccess(3) version14(14)} +iPIRIObjId RELATIVE-OID ::= {iPAccessPDUObjId iRI(1)} +iPCCObjId RELATIVE-OID ::= {iPAccessPDUObjId cC(2)} +iPIRIOnlyObjId RELATIVE-OID ::= {iPAccessPDUObjId iRIOnly(3)} + -- all four definitions relative to {itu-t(0) identified-organization(4) + -- etsi(0) securityDomain(2) lawfulintercept(2)} + -- ========================== -- IP Communications Contents @@ -53,7 +55,7 @@ IPIRIContents ::= SEQUENCE { accessEventType [0] AccessEventType, targetUsername [1] OCTET STRING, - -- in ASCIIcharacters + -- in ASCII-characters internetAccessType [2] InternetAccessType, iPVersion [3] IPVersion, targetIPAddress [4] IPAddress OPTIONAL, @@ -126,7 +128,7 @@ AccessEventType ::= ENUMERATED accessReject(2), -- IAS access is refused to the target accessFailed(3), - -- The Access_attempt timed-out or failed otherwise + -- The accessAttempt timed-out or failed otherwise sessionStart(4), -- A target starts using the IAS; not in use anymore from version 4(4) sessionEnd(5), @@ -241,7 +243,7 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 101 671 [1]. + -- IPAddress imported from TS 102 232 [2]. -- This can be an IPv4 address (with or without a subnet range defined) or -- an IPv6 address (with or without a prefix range defined). ... @@ -271,7 +273,8 @@ IPIRIOnly ::= SEQUENCE protocolInformation [2] ProtocolInformation, iPAggregatedNbrOfPackets [3] INTEGER OPTIONAL, iPAggregatedNbrOfBytes [4] INTEGER OPTIONAL, - ... + ..., + pDSRInformation [5] PDSRInformation OPTIONAL } IPInformation ::= CHOICE @@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE checkSum [3] OCTET STRING (SIZE (2))OPTIONAL } +PDSRInformation::= SEQUENCE +{ + summaryTrigger [0] PDSRSummaryTrigger, + firstPacketTimestamp [1] GeneralizedTime, + lastPacketTimestamp [2] GeneralizedTime, + packetCount [3] INTEGER, + byteCount [4] INTEGER, + ... +} + +PDSRSummaryTrigger ::= ENUMERATED +{ + startOfFlow(0), + timerExpiry(1), + packetCount(2), + byteCount(3), + endOfFlow(4), + ... +} + + END -- end of IPAccessPDU diff --git a/102232-5/IPMultimediaPDU.asn b/102232-5/IPMultimediaPDU.asn index 67e9fbebee0fb3f1c0936b8c98ad9964bca047b5..d70768d6e317678923593920530fc57507fff441 100644 --- a/102232-5/IPMultimediaPDU.asn +++ b/102232-5/IPMultimediaPDU.asn @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer (see clause 5.2.7). h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address + -- Copy of the H.323 content and the source and destination IP address of the intercepted + -- H.323 message as transmitted on the network layer (see clause 5.2.7). ..., nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations @@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers -- see clause 5.2.6. iRIOnlySIPMessage [6] SIPMessage - -- Copy of the SIP content and the source and destination IP address - -- see clause 5.2.6. + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer. + -- (see clause 5.2.6 and 5.2.7). } SIPMessage ::= SEQUENCE diff --git a/102232-5/portal/IPMultimediaPDU,ver12.txt b/102232-5/portal/IPMultimediaPDU,ver13.txt similarity index 93% rename from 102232-5/portal/IPMultimediaPDU,ver12.txt rename to 102232-5/portal/IPMultimediaPDU,ver13.txt index 67e9fbebee0fb3f1c0936b8c98ad9964bca047b5..d70768d6e317678923593920530fc57507fff441 100644 --- a/102232-5/portal/IPMultimediaPDU,ver12.txt +++ b/102232-5/portal/IPMultimediaPDU,ver13.txt @@ -4,7 +4,7 @@ IPMultimediaPDU -{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version12(12)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version13(13)} DEFINITIONS IMPLICIT TAGS ::= BEGIN @@ -22,8 +22,8 @@ IMPORTS -- Object Identifier Definition -- ============================ -iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) iRI(1)} -iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version12(12) cC(2)} +iPMMIRIObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) iRI(1)} +iPMMCCObjId RELATIVE-OID ::= {li-ps(5) iPMultimedia(5) version13(13) cC(2)} -- both definitions relative to: -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2)} @@ -107,9 +107,11 @@ IPIRIContents ::= CHOICE originalIPMMMessage [0] OCTET STRING, -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers sIPMessage [1] SIPMessage, - -- Copy of the SIP content and the source and destination IP address + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer (see clause 5.2.7). h323Message [2] H323Message, - -- Copy of the H.323 content and the source and destination IP address + -- Copy of the H.323 content and the source and destination IP address of the intercepted + -- H.323 message as transmitted on the network layer (see clause 5.2.7). ..., nationalIPMMIRIParameters [3] NationalIPMMIRIParameters, -- This parameter is used according to national regulations @@ -120,8 +122,9 @@ IPIRIContents ::= CHOICE -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers -- see clause 5.2.6. iRIOnlySIPMessage [6] SIPMessage - -- Copy of the SIP content and the source and destination IP address - -- see clause 5.2.6. + -- Copy of the SIP content and the source and destination IP address of the intercepted + -- SIP message as transmitted on the network layer. + -- (see clause 5.2.6 and 5.2.7). } SIPMessage ::= SEQUENCE diff --git a/102657/RDMessage.asn b/102657/RDMessage.asn index 9f4ff3256690a89000f9dc26c78955ada994eabd..ea717ef2e6ce2597ff23706154f64f6eb0996d64 100644 --- a/102657/RDMessage.asn +++ b/102657/RDMessage.asn @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version24(24)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version24(24)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -457,7 +457,8 @@ IndividualInfo ::= SEQUENCE { male(0), female(1), - ... + ..., + other(2) } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, diff --git a/102657/RDMessage.xsd b/102657/RDMessage.xsd index f075f3422935c197745378ae5242fd4780352ddf..e74c0c29138a10a164309b81a1aafd1ad5ae741e 100644 --- a/102657/RDMessage.xsd +++ b/102657/RDMessage.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.26.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 @@ -603,6 +603,7 @@ + @@ -2366,7 +2367,7 @@ - + diff --git a/102657/portal/RDMessagever23.txt b/102657/portal/RDMessagever25.txt similarity index 97% rename from 102657/portal/RDMessagever23.txt rename to 102657/portal/RDMessagever25.txt index e806118ac58b26df5f381adefc8a154baf0d8e52..ea717ef2e6ce2597ff23706154f64f6eb0996d64 100644 --- a/102657/portal/RDMessagever23.txt +++ b/102657/portal/RDMessagever25.txt @@ -1,4 +1,4 @@ -RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version23(23)} +RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -12,7 +12,7 @@ BEGIN retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)} -- rdHeader -rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version23(23)} +rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version25(25)} -- ====================================== -- Top level definitions for RDHI wrapper @@ -457,7 +457,8 @@ IndividualInfo ::= SEQUENCE { male(0), female(1), - ... + ..., + other(2) } OPTIONAL, identificationNumber [5] UTF8String OPTIONAL, authenticationInfo [6] AuthenticationInfo OPTIONAL, @@ -665,10 +666,13 @@ ICCIDInfo ::= SEQUENCE -- PUK2 code associated with the ICCID iMSI [5] IMSI OPTIONAL, sUPI [6] SUPI OPTIONAL, - gPSI [7] GPSI OPTIONAL + gPSI [7] GPSI OPTIONAL, + eID [8] NumericString (SIZE (32)) OPTIONAL + -- Identifier of the eUICC according to GSMA SGP.02, clause 2.2.2 [53] } + LoginInfo ::= SEQUENCE { login [1] UTF8String OPTIONAL, @@ -1322,10 +1326,12 @@ Location ::= SEQUENCE NCGI ::= SEQUENCE { - pLMNID [1] PLMNID, - nRCellID [2] NRCellID + pLMNID [1] PLMNID, + nRCellID [2] NRCellID, + ... } + N3gppaLocation ::= SEQUENCE { n3gppTai [1] OCTET STRING (SIZE (5..6)) OPTIONAL, @@ -2517,9 +2523,13 @@ NwAccessType ::= ENUMERATED wimax(6), mobilePacketData(7), -- Network access over GSM/3GPP GPRS, UMTS, etc. - ... + ..., + gPON(8) + -- Gigabit capable Passive Optical Network access, based on Optical Line Terminal, + -- see ITU-T G.984-1 [54] } + DialUpInformation ::= SEQUENCE { diallingNumber [1] PartyNumber OPTIONAL, @@ -2583,10 +2593,12 @@ EPSInformation ::= SEQUENCE -- RAT Type coding according to ETSI TS 129 274 [32] clause 8.17 -- NOTE - as of v1.23.1 of the present document, this field has changed to optional ePSEvent [15] EPSEvent OPTIONAL, - ... + ..., + uERadioCapID [16] UERadioCapID OPTIONAL } + IMSIUnauthenticatedFlag ::= BOOLEAN -- TRUE if unauthenticated IMSI vs. FALSE for authenticated IMSI @@ -2628,59 +2640,65 @@ EPSEvent ::= ENUMERATED FIVEGSInformation ::= SEQUENCE { - sUPI [1] SUPI OPTIONAL, - dNN [2] UTF8String OPTIONAL, - gPSI [3] GPSI OPTIONAL, - pEI [4] PEI OPTIONAL, + sUPI [1] SUPI OPTIONAL, + dNN [2] UTF8String OPTIONAL, + gPSI [3] GPSI OPTIONAL, + pEI [4] PEI OPTIONAL, pDUSessionID [6] INTEGER (0..255) OPTIONAL, - sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, + sNSSAI [7] OCTET STRING (SIZE(4)) OPTIONAL, pDUIpv4Address [8] IPAddress OPTIONAL, pDUIpv6Address [9] IPAddress OPTIONAL, - pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, - rFSPIndex [11] INTEGER (1..255) OPTIONAL, + pDUAddressPrefixLength [10] INTEGER (0..128) OPTIONAL, + rFSPIndex [11] INTEGER (1..255) OPTIONAL, applicationId [12] UTF8String OPTIONAL, - applicationServiceProviderIdentity [13] UTF8String OPTIONAL, - serviceId [14] INTEGER OPTIONAL, - chargingId [15] UTF8String OPTIONAL, - pDUType [16] PDUSessionType OPTIONAL, - sSCMode [17] SSCMode OPTIONAL, - vPLMNId [18] PLMNID OPTIONAL, - hPLMNId [19] PLMNID OPTIONAL, - chargingCharacteristics [20] UTF8String OPTIONAL, - chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, + applicationServiceProviderIdentity [13] UTF8String OPTIONAL, + serviceId [14] INTEGER OPTIONAL, + chargingId [15] UTF8String OPTIONAL, + pDUType [16] PDUSessionType OPTIONAL, + sSCMode [17] SSCMode OPTIONAL, + vPLMNId [18] PLMNID OPTIONAL, + hPLMNId [19] PLMNID OPTIONAL, + chargingCharacteristics [20] UTF8String OPTIONAL, + chargingCharacteristicsSelectionMode [21] UTF8String OPTIONAL, pDUSessionStartTime [22] GeneralizedTime OPTIONAL, pDUSessionStopTime [23] GeneralizedTime OPTIONAL, - lowPriorityIndicator [24] BOOLEAN OPTIONAL, + lowPriorityIndicator [24] BOOLEAN OPTIONAL, dataOffStatus [25] BOOLEAN OPTIONAL, - diagnostics [26] INTEGER OPTIONAL, - uETimeZone [27] UTF8String OPTIONAL, - uPFAddress [28] IPAddress OPTIONAL, - aMFAddress [29] IPAddress OPTIONAL, - uDMAddress [30] IPAddress OPTIONAL, - sMFAddress [31] IPAddress OPTIONAL, - uPFId [32] UUID OPTIONAL, + diagnostics [26] INTEGER OPTIONAL, + uETimeZone [27] UTF8String OPTIONAL, + uPFAddress [28] IPAddress OPTIONAL, + aMFAddress [29] IPAddress OPTIONAL, + uDMAddress [30] IPAddress OPTIONAL, + sMFAddress [31] IPAddress OPTIONAL, + uPFId [32] UUID OPTIONAL, aMFIdentifier [33] AMFID OPTIONAL, uDMIdentifier [34] UUID OPTIONAL, sMFIdentifier [35] UUID OPTIONAL, uPFPDNAddress [36] IPAddress OPTIONAL, - uPFPDNAddressExtension [37] IPAddress OPTIONAL, + uPFPDNAddressExtension [37] IPAddress OPTIONAL, dynamicAddressFlag [38] BOOLEAN OPTIONAL, - dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, - rAT5Type [40] RAT5Type OPTIONAL, - flowQosInfo [41] OCTET STRING OPTIONAL, - serviceID [42] INTEGER OPTIONAL - + dynamicAddressFlagExt [39] BOOLEAN OPTIONAL, + rAT5Type [40] RAT5Type OPTIONAL, + flowQosInfo [41] OCTET STRING OPTIONAL, + serviceID [42] INTEGER OPTIONAL, + ..., + uERadioCapID [43] UERadioCapID OPTIONAL, + rANSecondaryRATType [44] RAT5Type OPTIONAL } + + PDUSessionType ::= ENUMERATED { iPv4(1), iPv6(2), iPv4v6(3), unstructured(4), - ethernet(5) + ethernet(5), + ... } + -- ==================================== -- Definitions of Network Access Device -- ==================================== @@ -2699,9 +2717,11 @@ NADevice ::= SEQUENCE dslID [5] UTF8String OPTIONAL, imei [6] IMEI OPTIONAL, ..., - subscriberID [7] NaSubscriberID OPTIONAL + subscriberID [7] NaSubscriberID OPTIONAL, + uERadioCapID [8] UERadioCapID OPTIONAL } + SUPI ::= CHOICE { iMSI [1] IMSI, @@ -2719,9 +2739,11 @@ GPSI ::= CHOICE PEI ::= CHOICE { iMEI [1] IMEI, - iMEISV [2] IMEISV + iMEISV [2] IMEISV, + ... } + IMEI ::= OCTET STRING (SIZE(8)) -- format as per 3GPP TS 09.02 [8] -- NOTE: When comparing IMEIs, an IMEI can be considered "equal to" the requested IMEI even @@ -2734,6 +2756,9 @@ IMSI ::= OCTET STRING (SIZE(3..8)) NAI ::= UTF8String +UERadioCapID ::= UTF8String (SIZE(12..22)) + -- format as per ETSI TS 123 003 [41] clause 29.2 + -- ====================================== -- Definitions of Message Network element -- ====================================== @@ -2849,14 +2874,27 @@ RAT5Type ::= ENUMERATED eutra(2), wlan(3), virtual(4), - ... + ..., + nBIoT(5), + wireline(6), + wirelineCable(7), + wirelineDSL(8), + wirelinePON(9), + lTEM(10), + nRU(11), + eUTRAU(12), + trustedN3GA(13), + trustedWLAN(14), + uTRA(15), + gERA(16) } AMFID ::= SEQUENCE { aMFRegionID [1] AMFRegionID, aMFSetID [2] AMFSetID, - aMFPointer [3] AMFPointer + aMFPointer [3] AMFPointer, + ... } AMFRegionID ::= INTEGER (0..255) diff --git a/102657/portal/RDMessagever23.xsd b/102657/portal/RDMessagever25.xsd similarity index 98% rename from 102657/portal/RDMessagever23.xsd rename to 102657/portal/RDMessagever25.xsd index 0f6a4b5ba07409b86865b0aefba22fdd89e7d362..e74c0c29138a10a164309b81a1aafd1ad5ae741e 100644 --- a/102657/portal/RDMessagever23.xsd +++ b/102657/portal/RDMessagever25.xsd @@ -1,8 +1,8 @@ - + - XSD translated from ASN.1 derived from outcome of TS 102 657 v1.25.1 + XSD translated from ASN.1 derived from outcome of TS 102 657 v1.27.1 @@ -282,6 +282,7 @@ + @@ -602,6 +603,7 @@ + @@ -665,6 +667,14 @@ + + + + + + + + @@ -1498,7 +1508,7 @@ - + @@ -2251,6 +2261,7 @@ + @@ -2354,6 +2365,9 @@ + + + @@ -2381,6 +2395,18 @@ + + + + + + + + + + + + @@ -2435,6 +2461,7 @@ + @@ -3240,4 +3267,10 @@ + + + + + + diff --git a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml index 1a463ac204b2c0af78881984160d4d3b466d522b..d5711021a34fd13dc744ab71d790c72a08c58c59 100644 --- a/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml +++ b/103120/dictionaries/ts_103120_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -30,7 +30,7 @@ - + ETSI AuthorisationLegalType @@ -40,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -54,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -92,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -126,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -144,7 +144,7 @@ - + ETSI DocumentStatus @@ -178,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -208,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -228,7 +228,7 @@ - + ETSI TaskStatus @@ -270,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -304,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -327,7 +327,7 @@ - + ETSI HandoverFormat @@ -357,7 +357,7 @@ - + ETSI TaskFlag @@ -372,14 +372,83 @@ IsNonLocal Indicates that the current Task shall be intercepted as a non-local identity. - + IsLocal Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. - + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + - + + ETSI + RequestType + + + ETSI LDHandoverFormat @@ -401,4 +470,40 @@ + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml index 198e00ac9301711cbf02882a5d76261473d16c4a..5e5f226800ba796c704d3f2075b837b783dc7cb1 100644 --- a/103120/examples/mutliple-auth-example-request.xml +++ b/103120/examples/mutliple-auth-example-request.xml @@ -12,7 +12,7 @@ d442c58c-d5e1-4fd9-90ec-9c228ad947f1 2020-09-22T08:06:17.025833Z - V1.7.1 + V1.8.1 XX v1.1.1 diff --git a/103120/examples/request1.xml b/103120/examples/request1.xml index 34ecaed2f8c9dbf1095e0789c0115e1d705ae24c..e8b6a5f8b113cfebe8e5f05f6aee82752fbc0184 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index 81476ba57e6154be6ac7a5bef0e3589de043953f..67cbefd85d9617fe8c574c0bd449694b2dbcdc8f 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index 59d4621a98811473ea1b745848246e94b3d8d0d7..5da0df382bc54aab96d7a577222fcc449c0fe42b 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index c4e750dbd1e2ae130020425d0be9e9d89bad48a8..555974f0a91b1cda95c0ec060fd6d75bf278de9f 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Deli.xml similarity index 92% rename from 103120/examples/request5-Binary-Delivery.xml rename to 103120/examples/request5-Binary-Deli.xml index 048837e9087d22cfbca224d4d6df2d31d9ecf040..7d5170752e0475762923ed6fbdcc9282801b8114 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Deli.xml similarity index 95% rename from 103120/examples/request5-XML-Delivery.xml rename to 103120/examples/request5-XML-Deli.xml index f6636600dd012c2dc826285023b6408256feb4b8..f9314cdd3f3719b3d67dd0ba88122e0071a905d4 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Deli.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index aca92d177f4115dbd2a5dc452550f1ecdbae009c..25aa22c9fee5e4873142b34d7aff30c82e25021e 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 1980184631a9a0c44bc1652ac573fd0f441b2359..9ae5d35a80a58d747f995357752a222cdb41cd5d 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 6487a8dc04f310d6e0e2bcae09367ac3b371991d..e3b1537dce4c53c395ef3c1adc6090af76661793 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.7.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index 4a5e16c2ed62cf75fd2b7b8632e7fe628acf1ed0..a8dc811c0046124966418f8127ad3b8affd9f312 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index 030867e205c902579f01117f69f86bd87da0b4c6..e210444e8a85f4dab6b4e2e9a593c551db3b8596 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.7.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd b/103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd similarity index 100% rename from 103120/portal/dictionaries/ts_103120v010401p0_Dictionaries.xsd rename to 103120/portal/dictionaries/ts_103120v010801p0_Dictionaries.xsd diff --git a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml similarity index 61% rename from 103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml rename to 103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml index 477914c542be7f6b946ca106e9f7fb0cc9b26a31..d5711021a34fd13dc744ab71d790c72a08c58c59 100644 --- a/103120/portal/dictionaries/ts_103120v010401p0_ETSIDictionaryDefinitions.xml +++ b/103120/portal/dictionaries/ts_103120v010801p0_ETSIDictionaryDefinitions.xml @@ -1,6 +1,6 @@ - + ETSI ObjectType @@ -18,11 +18,19 @@ Task - A Task Object as defined in section 8.2 - + An LI Task Object as defined in section 8.2 + + + LDTask + An LD Task Object as defined in section 8.3 + + + Delivery + A Delivery Object as defined in section 10 + - + ETSI AuthorisationLegalType @@ -32,7 +40,7 @@ - + ETSI AuthorisationPriority @@ -46,7 +54,7 @@ - + ETSI AuthorisationStatus @@ -84,7 +92,7 @@ - + ETSI AuthorisationDesiredStatus @@ -118,7 +126,7 @@ - + ETSI AuthorisationFlag @@ -136,7 +144,7 @@ - + ETSI DocumentStatus @@ -170,7 +178,7 @@ - + ETSI DocumentDesiredStatus @@ -200,17 +208,17 @@ - + ETSI DocumentType Warrant - This Document represents a legal Warrant + This Document represents a legal warrant - + ETSI NotificationType @@ -220,7 +228,7 @@ - + ETSI TaskStatus @@ -262,7 +270,7 @@ - + ETSI TaskDesiredStatus @@ -296,12 +304,12 @@ - + ETSI TaskServiceType - + - + ETSI TaskDeliveryType @@ -319,7 +327,7 @@ - + ETSI HandoverFormat @@ -349,7 +357,7 @@ - + ETSI TaskFlag @@ -361,6 +369,141 @@ IsEmergency Indicates if the LI Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + IsNonLocal + Indicates that the current Task shall be intercepted as a non-local identity. + + + IsLocal + Indicates that the current Task shall be intercepted as local identity. If both the IsNonLocal and IsLocal flag are absent, the Task shall be intercepted as a local identity unless otherwise agreed. + + + + + ETSI + LDTaskStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + DisclosureNotAvailable + The Task has been processed and the CSP has determined there is no product available to disclosure + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + Error + The Task has not been processed due to a problem with the underlying LD system + + + Invalid + The Task is not active due to a problem with the current information populated in the Task Object + + + + + ETSI + LDTaskDesiredStatus + + + AwaitingApproval + The Task is still waiting approval from one or more relevant authorities + + + AwaitingDisclosure + The Task is approved, but is not yet processed by the LD system + + + Disclosed + The Task has been processed and the product has been disclosed by the LD system + + + Rejected + The Task has been explicitly denied or rejected by one or more relevant authorities. + + + Cancelled + The Task has been permanently cancelled + + + + + ETSI + RequestType + + + + ETSI + LDHandoverFormat + + + TS102657 + Handed over in ETSI TS 102 657 format, using HI-B + + + EncapsulatedTS102657 + Handed over as ETSI TS 102 657 format using the DeliveryObject as described in clause 10 + + + TS103120 + Handed over using the DeliveryObject as described in clause 10 + + + TS103707 + Handed over as ETSI TS 103 707, using the DeliveryObject as described in clause 10 + + + + + ETSI + LDTaskFlag + + + IsTest + Indicates that the current Task is for test purposes. This may alter the process or documentation accompanying the authorisation + + + IsEmergency + Indicates if the LD Task was issued under nationally-defined emergency procedures. The circumstances and consequences for setting the field shall be defined by the relevant national profile (see clause B.1.3) + + + IsNonLocal + Indicates that the current Task shall disclose information about a non-local identity. + + + IsLocal + Indicates that the current Task shall disclose information about a local identity. If both the IsNonLocal and IsLocal flag are absent, the identity provided within the Task shall be considered as a local identity unless otherwise agreed. + + + ETSI + ManifestSpecification + + + TS102657-ASN.1 + Delievery according to ETSI TS 102 657 using ASN.1 encoding + + + TS102657-XML + Delievery according to ETSI TS 102 657 using XML encoding + + + diff --git a/103120/portal/examples/mutliple-auth-example-request.xml b/103120/portal/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000000000000000000000000000000000000..5e5f226800ba796c704d3f2075b837b783dc7cb1 --- /dev/null +++ b/103120/portal/examples/mutliple-auth-example-request.xml @@ -0,0 +1,51 @@ + + +
+ + XX + Sender + + + XX + Receiver + + d442c58c-d5e1-4fd9-90ec-9c228ad947f1 + 2020-09-22T08:06:17.025833Z + + V1.8.1 + XX + v1.1.1 + +
+ + + + + 1 + + + cd3994b1-e5f3-4b59-a852-5fecd02bd247 + + Single Approval + + + + + + 2 + + + 64e8681a-a4de-4dea-9686-4a2a15e54786 + + First of two approvals + + + Second of two approvals + + + + + + + + \ No newline at end of file diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index 94e268009f8f13143cba608f08e9241193afc098..e8b6a5f8b113cfebe8e5f05f6aee82752fbc0184 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z @@ -41,7 +41,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index 4841ccf6734dbf725a5cf73abdebbc5b8050b8ee..67cbefd85d9617fe8c574c0bd449694b2dbcdc8f 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index 4de508d530ab73e6698d7aa659c7c28977f2cbad..5da0df382bc54aab96d7a577222fcc449c0fe42b 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 4193f541-5e19-468e-b4a3-1c636ce115e9 XX - SENDER01 + ACTOR01 W000001 2015-09-01T12:00:00Z diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index d3a0da03e4e099d2e7dd296f1e7abcfedc1203da..555974f0a91b1cda95c0ec060fd6d75bf278de9f 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 W000001 2019-09-30T12:00:00Z @@ -41,11 +41,11 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 7dbbc880-8750-4d3c-abe7-ea4a17646045 - XX-SENDER01-1234 + XX-ACTOR01-1234 2019-09-30T12:00:00Z 2019-12-30T12:00:00Z @@ -68,7 +68,7 @@ XX - RECEIVER01 + ACTOR02 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index ae0caca1073de116ac21f898be0e6ee810f12296..7d5170752e0475762923ed6fbdcc9282801b8114 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR2 XX - RECEIVER01 + ACTOR1 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - XX-SENDER01-12345 + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index b70a8f73d2bec96422467f1bb9025ef7c5dc71a4..f9314cdd3f3719b3d67dd0ba88122e0071a905d4 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -30,7 +30,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 - ExampleLIID + XX-ACTOR01-1234 d1079830-8e9a-4731-8fb7-36b9b961eb72 1 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index 5378b8e939ccc59168f8ecd75c481d357f42c1af..25aa22c9fee5e4873142b34d7aff30c82e25021e 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 73da83e8951378e7e9760341d36127ecc7fd35cb..9ae5d35a80a58d747f995357752a222cdb41cd5d 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -26,7 +26,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 1 2015-09-01T12:00:00Z W000001 @@ -52,7 +52,7 @@ 2b36a78b-b628-416d-bd22-404e68a0cd36 XX - SENDER01 + ACTOR01 1 7dbbc880-8750-4d3c-abe7-ea4a17646045 @@ -89,7 +89,7 @@ XX - RECVER01 + ACTOR02 3000 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 44ba51e4a5a29d9d5ed60566bfea880b18f4ee07..e3b1537dce4c53c395ef3c1adc6090af76661793 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECVER01 + ACTOR02 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.6.1 + V1.8.1 XX v1.0 @@ -33,7 +33,7 @@ 7dbbc880-8750-4d3c-abe7-ea4a17646045 XX - SENDER01 + ACTOR01 2 4193f541-5e19-468e-b4a3-1c636ce115e9 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index 39c27e6b451c1f5a1d7074514ef77a02a1511f87..a8dc811c0046124966418f8127ad3b8affd9f312 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -3,16 +3,16 @@
XX - SENDER01 + ACTOR01 XX - RECEIVER01 + ACTOR02 c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index e135903b07ac62a9528c2356e16c4ed0c723a21b..e210444e8a85f4dab6b4e2e9a593c551db3b8596 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -8,16 +8,16 @@
XX - SENDER01 + ACTOR02 XX - RECEIVER01 + ACTOR01 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.6.1 + V1.8.1 XX v1.0 diff --git a/103120/portal/schema/TS_103_280_v020401.xsd b/103120/portal/schema/TS_103_280_v020401.xsd deleted file mode 100644 index 1f321550ca94b417d34b3cf7b113426766e97d6e..0000000000000000000000000000000000000000 --- a/103120/portal/schema/TS_103_280_v020401.xsd +++ /dev/null @@ -1,239 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Authorisation.xsd rename to 103120/portal/schema/ts_103120v010801p0_Authorisation.xsd index 14b50d7e6005b76431f32dee18b8de5042e968c6..72e87c0407ab6750187b5283c95fbf2ff85fe1d0 100644 --- a/103120/portal/schema/ts_103120v010501p0_Authorisation.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Authorisation.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Authorisation" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Authorisation" + xmlns="http://uri.etsi.org/03120/common/2020/09/Authorisation" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Authorisation" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -26,7 +26,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Common.xsd b/103120/portal/schema/ts_103120v010801p0_Common.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Common.xsd rename to 103120/portal/schema/ts_103120v010801p0_Common.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Core.xsd b/103120/portal/schema/ts_103120v010801p0_Core.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Core.xsd rename to 103120/portal/schema/ts_103120v010801p0_Core.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Delivery.xsd b/103120/portal/schema/ts_103120v010801p0_Delivery.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Delivery.xsd rename to 103120/portal/schema/ts_103120v010801p0_Delivery.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Document.xsd b/103120/portal/schema/ts_103120v010801p0_Document.xsd similarity index 93% rename from 103120/portal/schema/ts_103120v010501p0_Document.xsd rename to 103120/portal/schema/ts_103120v010801p0_Document.xsd index 86b719295193146c4dcb25d6a1c5f0d43f366288..af6f13979824aba2c967860b1473bc7df91fac32 100644 --- a/103120/portal/schema/ts_103120v010501p0_Document.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Document.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2016/02/Document" - targetNamespace="http://uri.etsi.org/03120/common/2016/02/Document" + xmlns="http://uri.etsi.org/03120/common/2020/09/Document" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Document" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -24,7 +24,7 @@ - + diff --git a/103120/portal/schema/ts_103120v010501p0_Notification.xsd b/103120/portal/schema/ts_103120v010801p0_Notification.xsd similarity index 100% rename from 103120/portal/schema/ts_103120v010501p0_Notification.xsd rename to 103120/portal/schema/ts_103120v010801p0_Notification.xsd diff --git a/103120/portal/schema/ts_103120v010501p0_Task.xsd b/103120/portal/schema/ts_103120v010801p0_Task.xsd similarity index 97% rename from 103120/portal/schema/ts_103120v010501p0_Task.xsd rename to 103120/portal/schema/ts_103120v010801p0_Task.xsd index ed8974ed70f7bf67d1a97b7b3e445682299c9d56..ae3e65e38bb1acce08c953ff0393154c57f5d217 100644 --- a/103120/portal/schema/ts_103120v010501p0_Task.xsd +++ b/103120/portal/schema/ts_103120v010801p0_Task.xsd @@ -3,8 +3,8 @@ xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" - xmlns="http://uri.etsi.org/03120/common/2019/10/Task" - targetNamespace="http://uri.etsi.org/03120/common/2019/10/Task" + xmlns="http://uri.etsi.org/03120/common/2020/09/Task" + targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" elementFormDefault="qualified" attributeFormDefault="unqualified"> @@ -23,7 +23,7 @@ - + @@ -123,7 +123,7 @@ - + diff --git a/103120/portal/validate_examples.py b/103120/portal/validate_examples.py deleted file mode 100644 index 60c611ca32a8ec342fc689a351e9960326d6fc3d..0000000000000000000000000000000000000000 --- a/103120/portal/validate_examples.py +++ /dev/null @@ -1,42 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010501p0_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file diff --git a/103120/schema/ts_103120_Delivery.xsd b/103120/schema/ts_103120_Deli.xsd similarity index 100% rename from 103120/schema/ts_103120_Delivery.xsd rename to 103120/schema/ts_103120_Deli.xsd diff --git a/103120/validate_examples.py b/103120/validate_examples.py deleted file mode 100644 index 133bad9e9e14f94a17666a9ad5bfb43b2db64c6c..0000000000000000000000000000000000000000 --- a/103120/validate_examples.py +++ /dev/null @@ -1,49 +0,0 @@ -import glob -import sys -from pathlib import Path -from pprint import pprint - -if __name__ == '__main__': - - if sys.version_info <= (3, 5): - sys.exit('ERROR: You need at least Python 3.5 to run this tool') - - try: - from lxml import etree - except ImportError: - sys.exit('ERROR: You need to install the Python lxml library') - - try: - import xmlschema - except ImportError: - sys.exit('ERROR: You need to install the xml schema library') - - - locations = [] - schemaFiles = glob.glob('schema/*.xsd') - for schemaFile in schemaFiles: - xs = xmlschema.XMLSchema(schemaFile, validation='skip') - locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - - etsiSchema = str(Path('../103280/TS_103_280.xsd')) - xs = xmlschema.XMLSchema(etsiSchema, validation='skip') - locations.append((xs.default_namespace, str(Path("../" + etsiSchema)))) - - for location in locations: - print (location) - - coreSchema = xmlschema.XMLSchema('schema/ts_103120_Core.xsd', locations=locations) - - for schema in schemaFiles: - newSchema = xmlschema.XMLSchema(schema, locations=locations) - coreSchema.import_schema(newSchema.default_namespace, schema) - - examples = glob.glob('examples/*.xml') - for example in examples: - try: - coreSchema.validate(example) - print ("{0} passed validation".format(example)) - except Exception as ex: - print ("{0} failed validation: {1}".format(example, ex)) - - print ('Done') \ No newline at end of file diff --git a/103221-1/TS_103_221_01.xsd b/103221-1/TS_103_221_01.xsd index 73a038022e1b1e779402c164c1d407f300c08fce..2cf5206327d992c5f46c749e1cbc4b176f61e05b 100644 --- a/103221-1/TS_103_221_01.xsd +++ b/103221-1/TS_103_221_01.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -178,17 +178,17 @@ - + - + - + @@ -259,7 +259,7 @@ - + @@ -422,7 +422,7 @@ - + diff --git a/103221-1/examples/desktop.ini b/103221-1/examples/desktop.ini new file mode 100644 index 0000000000000000000000000000000000000000..8b699c692d358fa29d7ac0976e524fe25c5da053 Binary files /dev/null and b/103221-1/examples/desktop.ini differ diff --git a/103221-1/portal/TS_103_221_01_v010601.xsd b/103221-1/portal/TS_103_221_01_v010801.xsd similarity index 99% rename from 103221-1/portal/TS_103_221_01_v010601.xsd rename to 103221-1/portal/TS_103_221_01_v010801.xsd index 73a038022e1b1e779402c164c1d407f300c08fce..2cf5206327d992c5f46c749e1cbc4b176f61e05b 100644 --- a/103221-1/portal/TS_103_221_01_v010601.xsd +++ b/103221-1/portal/TS_103_221_01_v010801.xsd @@ -1,5 +1,5 @@ - + @@ -58,7 +58,7 @@ - + @@ -178,17 +178,17 @@ - + - + - + @@ -259,7 +259,7 @@ - + @@ -422,7 +422,7 @@ - + diff --git a/103221-1/examples/validate_examples.py b/103221-1/validate_examples.py similarity index 100% rename from 103221-1/examples/validate_examples.py rename to 103221-1/validate_examples.py diff --git a/103707/TS_103_707_v010101.xsd b/103707/TS_103_707.xsd similarity index 97% rename from 103707/TS_103_707_v010101.xsd rename to 103707/TS_103_707.xsd index 7d857dfb2fa0c05fd61379813837668ad5fb9c0a..2f33c569b42114734d1e647b80e05f507b577a8e 100644 --- a/103707/TS_103_707_v010101.xsd +++ b/103707/TS_103_707.xsd @@ -9,7 +9,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/103707/portal/TS_103_707_v010101.xsd b/103707/portal/TS_103_707_v010201.xsd similarity index 97% rename from 103707/portal/TS_103_707_v010101.xsd rename to 103707/portal/TS_103_707_v010201.xsd index 7d857dfb2fa0c05fd61379813837668ad5fb9c0a..2f33c569b42114734d1e647b80e05f507b577a8e 100644 --- a/103707/portal/TS_103_707_v010101.xsd +++ b/103707/portal/TS_103_707_v010201.xsd @@ -9,7 +9,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -109,7 +109,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/103707/portal/testing/validate_examples.py b/103707/portal/testing/validate_examples.py index 915de84e4d527c154fd485b89552fb59d93edfc0..fbcf21f25063b68e8ac31479b7f0978a70c31b9e 100644 --- a/103707/portal/testing/validate_examples.py +++ b/103707/portal/testing/validate_examples.py @@ -29,7 +29,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema) diff --git a/103707/testing/validate_examples.py b/103707/testing/validate_examples.py index 915de84e4d527c154fd485b89552fb59d93edfc0..fbcf21f25063b68e8ac31479b7f0978a70c31b9e 100644 --- a/103707/testing/validate_examples.py +++ b/103707/testing/validate_examples.py @@ -29,7 +29,7 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile)))) - coreSchema = xmlschema.XMLSchema('TS_103_707_v010101.xsd', locations=locations) + coreSchema = xmlschema.XMLSchema('TS_103_707_v010201.xsd', locations=locations) for schema in extraSchemas: newSchema = xmlschema.XMLSchema(schema)