From b843de82bcd897d1059681254d2b772e6a5fdb4a Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 25 Sep 2020 14:00:50 +0200 Subject: [PATCH 1/4] Update IPAccessPDU.asn as per LI(20)P55006r1 --- 102232-3/IPAccessPDU.asn | 56 ++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 16 deletions(-) diff --git a/102232-3/IPAccessPDU.asn b/102232-3/IPAccessPDU.asn index 5c84c65..2461f42 100644 --- a/102232-3/IPAccessPDU.asn +++ b/102232-3/IPAccessPDU.asn @@ -1,12 +1,13 @@ 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 +17,12 @@ 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,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 must be sent. + -- If it is available, it shall 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, @@ -112,9 +114,7 @@ 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 information - - + -- It is used to list all the available Framed Route and Framed IPv6 Route informationX } AccessEventType ::= ENUMERATED @@ -141,6 +141,7 @@ AccessEventType ::= ENUMERATED endOfInterceptionWithSessionActive(9), -- LI is ended on a target who still has an active session unknown(10) + } InternetAccessType ::= ENUMERATED @@ -199,7 +200,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 RFC 2132 [15] + -- For MAC address types, raw binary format as in IETF RFC 2132 [15] ipAddressType [2] IPAddress, -- For IP address types ... @@ -241,12 +242,13 @@ OtherTargetIdentifiers ::= CHOICE -- This list is extensible to accommodate other target identifiers which -- may be required in future. iPAddress [0] IPAddress, - -- IPAddress imported from TS 102 232 [2]. + -- IPAddress imported from ETSI 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 @@ -268,9 +270,10 @@ 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, ... } @@ -339,5 +342,26 @@ UDPInformation ::= SEQUENCE checkSum [3] OCTET STRING (SIZE (2))OPTIONAL } -END -- end of IPAccessPDU +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 -- GitLab From 85478fb529a8e0216d52945abfe9ff4cdc0a1687 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 25 Sep 2020 14:01:31 +0200 Subject: [PATCH 2/4] TS 103 120 CR012 (Multiple approval details) --- .../mutliple-auth-example-request.xml | 51 +++++++++++++++++++ 103120/examples/request1.xml | 4 +- 103120/examples/request2.xml | 4 +- 103120/examples/request3.xml | 4 +- 103120/examples/request4.xml | 4 +- 103120/examples/request5-Binary-Delivery.xml | 4 +- 103120/examples/request5-XML-Delivery.xml | 4 +- 103120/examples/response1.xml | 4 +- 103120/examples/response2.xml | 4 +- 103120/examples/response3.xml | 4 +- 103120/examples/response4.xml | 4 +- 103120/examples/response5.xml | 4 +- 103120/portal/examples/request1.xml | 4 +- 103120/portal/examples/request2.xml | 4 +- 103120/portal/examples/request3.xml | 4 +- 103120/portal/examples/request4.xml | 4 +- .../examples/request5-Binary-Delivery.xml | 4 +- .../portal/examples/request5-XML-Delivery.xml | 4 +- 103120/portal/examples/response1.xml | 4 +- 103120/portal/examples/response2.xml | 4 +- 103120/portal/examples/response3.xml | 4 +- 103120/portal/examples/response4.xml | 4 +- 103120/portal/examples/response5.xml | 4 +- 103120/schema/ts_103120_Authorisation.xsd | 6 +-- 103120/schema/ts_103120_Document.xsd | 6 +-- 103120/schema/ts_103120_Task.xsd | 8 +-- 103120/validate_examples.py | 9 +++- 27 files changed, 113 insertions(+), 55 deletions(-) create mode 100644 103120/examples/mutliple-auth-example-request.xml diff --git a/103120/examples/mutliple-auth-example-request.xml b/103120/examples/mutliple-auth-example-request.xml new file mode 100644 index 0000000..198e00a --- /dev/null +++ b/103120/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.7.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/examples/request1.xml b/103120/examples/request1.xml index d6d9aba..34ecaed 100644 --- a/103120/examples/request1.xml +++ b/103120/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request2.xml b/103120/examples/request2.xml index af4346d..81476ba 100644 --- a/103120/examples/request2.xml +++ b/103120/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request3.xml b/103120/examples/request3.xml index fb97577..59d4621 100644 --- a/103120/examples/request3.xml +++ b/103120/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request4.xml b/103120/examples/request4.xml index daa4b57..c4e750d 100644 --- a/103120/examples/request4.xml +++ b/103120/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-Binary-Delivery.xml b/103120/examples/request5-Binary-Delivery.xml index 285d5e1..048837e 100644 --- a/103120/examples/request5-Binary-Delivery.xml +++ b/103120/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/request5-XML-Delivery.xml b/103120/examples/request5-XML-Delivery.xml index 989165e..f663660 100644 --- a/103120/examples/request5-XML-Delivery.xml +++ b/103120/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response1.xml b/103120/examples/response1.xml index cc99dbc..aca92d1 100644 --- a/103120/examples/response1.xml +++ b/103120/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response2.xml b/103120/examples/response2.xml index 2f867c9..1980184 100644 --- a/103120/examples/response2.xml +++ b/103120/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response3.xml b/103120/examples/response3.xml index 3e48fb7..6487a8d 100644 --- a/103120/examples/response3.xml +++ b/103120/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response4.xml b/103120/examples/response4.xml index ff14ab0..4a5e16c 100644 --- a/103120/examples/response4.xml +++ b/103120/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/examples/response5.xml b/103120/examples/response5.xml index a4c69c9..030867e 100644 --- a/103120/examples/response5.xml +++ b/103120/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.7.1 XX v1.0 diff --git a/103120/portal/examples/request1.xml b/103120/portal/examples/request1.xml index d6d9aba..94e2680 100644 --- a/103120/portal/examples/request1.xml +++ b/103120/portal/examples/request1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request2.xml b/103120/portal/examples/request2.xml index af4346d..4841ccf 100644 --- a/103120/portal/examples/request2.xml +++ b/103120/portal/examples/request2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request3.xml b/103120/portal/examples/request3.xml index fb97577..4de508d 100644 --- a/103120/portal/examples/request3.xml +++ b/103120/portal/examples/request3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request4.xml b/103120/portal/examples/request4.xml index daa4b57..d3a0da0 100644 --- a/103120/portal/examples/request4.xml +++ b/103120/portal/examples/request4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-Binary-Delivery.xml b/103120/portal/examples/request5-Binary-Delivery.xml index 285d5e1..ae0caca 100644 --- a/103120/portal/examples/request5-Binary-Delivery.xml +++ b/103120/portal/examples/request5-Binary-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/request5-XML-Delivery.xml b/103120/portal/examples/request5-XML-Delivery.xml index 989165e..b70a8f7 100644 --- a/103120/portal/examples/request5-XML-Delivery.xml +++ b/103120/portal/examples/request5-XML-Delivery.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response1.xml b/103120/portal/examples/response1.xml index cc99dbc..5378b8e 100644 --- a/103120/portal/examples/response1.xml +++ b/103120/portal/examples/response1.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2015-09-01T12:00:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response2.xml b/103120/portal/examples/response2.xml index 2f867c9..73da83e 100644 --- a/103120/portal/examples/response2.xml +++ b/103120/portal/examples/response2.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 45002c1e-dc4a-470a-9152-8e752638c86c 2015-09-01T12:01:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response3.xml b/103120/portal/examples/response3.xml index 3e48fb7..44ba51e 100644 --- a/103120/portal/examples/response3.xml +++ b/103120/portal/examples/response3.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ 69353ac0-9582-4c71-b162-86259c99de20 2015-09-01T12:02:00.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response4.xml b/103120/portal/examples/response4.xml index ff14ab0..39c27e6 100644 --- a/103120/portal/examples/response4.xml +++ b/103120/portal/examples/response4.xml @@ -1,5 +1,5 @@ - +
XX @@ -12,7 +12,7 @@ c02358b2-76cf-4ba4-a8eb-f6436ccaea2e 2019-09-30T13:37:01.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/portal/examples/response5.xml b/103120/portal/examples/response5.xml index a4c69c9..e135903 100644 --- a/103120/portal/examples/response5.xml +++ b/103120/portal/examples/response5.xml @@ -2,7 +2,7 @@
@@ -17,7 +17,7 @@ 8854cfad-44ac-43b8-99ae-530b690b43da 2019-09-30T13:37:37.000000Z - V1.5.1 + V1.6.1 XX v1.0 diff --git a/103120/schema/ts_103120_Authorisation.xsd b/103120/schema/ts_103120_Authorisation.xsd index 14b50d7..72e87c0 100644 --- a/103120/schema/ts_103120_Authorisation.xsd +++ b/103120/schema/ts_103120_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/schema/ts_103120_Document.xsd b/103120/schema/ts_103120_Document.xsd index 86b7192..af6f139 100644 --- a/103120/schema/ts_103120_Document.xsd +++ b/103120/schema/ts_103120_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/schema/ts_103120_Task.xsd b/103120/schema/ts_103120_Task.xsd index ed8974e..ae3e65e 100644 --- a/103120/schema/ts_103120_Task.xsd +++ b/103120/schema/ts_103120_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/validate_examples.py b/103120/validate_examples.py index 7aae339..133bad9 100644 --- a/103120/validate_examples.py +++ b/103120/validate_examples.py @@ -25,7 +25,14 @@ if __name__ == '__main__': xs = xmlschema.XMLSchema(schemaFile, validation='skip') locations.append((xs.default_namespace, str(Path(schemaFile))[7:])) - coreSchema = xmlschema.XMLSchema('schema/ts_103120v010601p0_Core.xsd', locations=locations) + 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) -- GitLab From e5b6ed82c74242bfc8738110995766f91fea8956 Mon Sep 17 00:00:00 2001 From: canterburym Date: Fri, 25 Sep 2020 14:01:54 +0200 Subject: [PATCH 3/4] TS 102 232-1 CR088 (Use of CONTAINING content constraint) --- 102232-1/LI-PS-PDU.asn | 68 ++++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6def9ef..6ac85a1 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) version30(30)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version31(31)} DEFINITIONS IMPLICIT TAGS ::= @@ -198,12 +198,14 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} -- This import is only used for the handover between LEMFs. - -- from 3GPP TS 33.128 [46] - LINotificationPayload + -- from ETSI TS 133 128 [46] + 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). -- GitLab From 9c1d495771e8dff4df96b6d0aafced6eca3515d4 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 28 Sep 2020 11:37:38 +0100 Subject: [PATCH 4/4] Updating 232-1 ASN.1 from meeting --- 102232-1/LI-PS-PDU.asn | 58 +++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 6ac85a1..e8b6eed 100644 --- a/102232-1/LI-PS-PDU.asn +++ b/102232-1/LI-PS-PDU.asn @@ -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) version12(12)} -- from ETSI TS 102 232-6 [36] PstnIsdnCC, @@ -198,14 +198,14 @@ IMPORTS {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) informationHandover(4) ilhi(0) ilhiPdu(0) version1(1)} -- This import is only used for the handover between LEMFs. - -- from ETSI TS 133 128 [46] + -- from 3GPP TS 33.128 [46] 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 @@ -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 IETF RFC 3279 [43], clause 2.2.2. + -- DSS/DSA signature as described in RFC 3279 clause 2.2.2 [43]. ..., hashAlgorithm [4] HashAlgorithm OPTIONAL -- Clarifies the hash function if checkType is hash(1). -- GitLab