From f835c49beae0441533bcca399e49f62113c803b8 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 15 Jun 2020 12:32:48 +0100 Subject: [PATCH] TS 102 232-1 v3.13.1 (2017-03-22) agreed at LI#44 (Sophia-Antipolis, 2017-01-30) --- 102232-1/LI-PS-PDU.asn | 111 ++++++++++-------- ...I-PS-PDU,ver24.txt => LI-PS-PDU,ver25.txt} | 111 ++++++++++-------- 2 files changed, 126 insertions(+), 96 deletions(-) rename 102232-1/portal/{LI-PS-PDU,ver24.txt => LI-PS-PDU,ver25.txt} (89%) diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 3562e50..240f206 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) version24(24)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -55,7 +55,6 @@ IMPORTS PstnIsdnIRI FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, @@ -80,16 +79,16 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. + -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -101,7 +100,7 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - GCSEIRIsContent + GcseIRIsContent FROM GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} -- The relevant module (including the 3GPP release and version number) needs @@ -110,15 +109,15 @@ IMPORTS -- 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) + {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 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) + {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 3GPP TS 33.108 [9] @@ -142,17 +141,16 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from 3GPP TS 33.108 [9] - ThreeGPP-HI1-Operation + -- 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)} -- 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. -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- corresponding to different implementations and exclusive usage each other. - -- The implementation depends of national regulations or LEA/CSP negotiations. - -- 3GPP HI1 may be used with other services/networks than 3GPP’s one. - + -- The implementation depends of national regulations or LEA/CSP negotiations. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -170,13 +168,13 @@ IMPORTS -- from J-STD-025-B [39] LAESProtocol - FROM Laesp-j-std-025-b + FROM Laesp-j-std-025-b {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} CDMA2000LAESMessage - FROM CDMA2000CIIModule + FROM CDMA2000CIIModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader - FROM CDMA2000CCModule + FROM CDMA2000CCModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -187,7 +185,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) version24(24)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} -- ==================== -- Top-level definition @@ -205,7 +203,7 @@ PSHeader ::= SEQUENCE lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 - communicationIdentifier [3] CommunicationIdentifier, + communicationIdentifier [3] CommunicationIdentifier, sequenceNumber [4] INTEGER (0..4294967295), timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 @@ -227,7 +225,6 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - } TimeStampQualifier ::= ENUMERATED @@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., @@ -314,7 +311,7 @@ CCContents ::= CHOICE 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, + 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, @@ -335,24 +332,23 @@ MicroSecondTimeStamp ::= SEQUENCE IRIPayload ::= SEQUENCE { - iRIType [0] IRIType OPTIONAL, + iRIType [0] IRIType OPTIONAL, -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, + iRIContents [2] IRIContents, ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL, - sessionDirection [5] PayloadDirection OPTIONAL, - -- If the sessionDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + timeStampQualifier [4] TimeStampQualifier OPTIONAL, + sessionDirection [5] PayloadDirection OPTIONAL, + -- If the sessionDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL - -- If the payloadDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + payloadDirection [6] PayloadDirection OPTIONAL + -- If the payloadDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details - } IRIType ::= ENUMERATED @@ -426,7 +422,7 @@ ProSeIRI ::= CHOICE -- This structure may be commented out if not used { iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, + proseIRIsContent [1] ProSeIRIsContent, ... } @@ -435,7 +431,7 @@ GcseIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GCSEIRIsContent, + gcseIRIsContent [1] GcseIRIsContent, ... } @@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE -- (see clause 7.2.3) checkValue [3] OCTET STRING, -- Network byte order - -- In case of a DSA/DSS signature, the r and s values shall be concatenated - ... + -- 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]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). } CheckType ::= ENUMERATED { hash(1), - -- SHA-1 hash value + -- hash value signature(2), -- DSS/DSA signature ... @@ -494,6 +495,20 @@ DataType ::= ENUMERATED ... } + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + Option ::= CHOICE { pDUAcknowledgement [0] NULL, @@ -604,26 +619,26 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } --- ================== +-- =================================== -- Common Parameters --- ================== +-- =================================== Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL - } WlanLocationAttributes ::= SEQUENCE { - wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, + wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID ... -} +} + END --end of LI-PS-PDU diff --git a/102232-1/portal/LI-PS-PDU,ver24.txt b/102232-1/portal/LI-PS-PDU,ver25.txt similarity index 89% rename from 102232-1/portal/LI-PS-PDU,ver24.txt rename to 102232-1/portal/LI-PS-PDU,ver25.txt index 3562e50..240f206 100644 --- a/102232-1/portal/LI-PS-PDU,ver24.txt +++ b/102232-1/portal/LI-PS-PDU,ver25.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) version24(24)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version25(25)} DEFINITIONS IMPLICIT TAGS ::= @@ -14,7 +14,7 @@ IMPORTS IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version18(18)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -55,7 +55,6 @@ IMPORTS PstnIsdnIRI FROM PstnIsdnPDU {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) pstnIsdn(6) version5(5)} - -- from 3GPP TS 33.108 [9] IRI-Parameters, UmtsIRIsContent, @@ -80,16 +79,16 @@ IMPORTS EPSLocation FROM EpsHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2eps(8)} - -- The relevant module (including the 3GPP release and version number) needs + -- The relevant module (including the 3GPP release and version number) needs -- to be chosen when compiling the application. - + -- from 3GPP TS 33.108 [9] IRI-Parameters, ConfIRIsContent FROM CONFHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2conf(10)} -- The relevant module (including the 3GPP release and version number) needs - -- to be chosen when compiling the application. + -- to be chosen when compiling the application. -- from 3GPP TS 33.108 [9] IRI-Parameters, @@ -101,7 +100,7 @@ IMPORTS -- from 3GPP TS 33.108 [9] IRI-Parameters, - GCSEIRIsContent + GcseIRIsContent FROM GCSEHI2Operations {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) threeGPP(4) hi2gcse(13)} -- The relevant module (including the 3GPP release and version number) needs @@ -110,15 +109,15 @@ IMPORTS -- 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) + {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 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) + {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 3GPP TS 33.108 [9] @@ -142,17 +141,16 @@ IMPORTS -- The relevant module (including the 3GPP release and version number) -- needs to be chosen when compiling the application. - -- from 3GPP TS 33.108 [9] - ThreeGPP-HI1-Operation + -- 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)} -- 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. -- TS 101 671 HI1 and 3GPP HI1 are related to the same functionality but are -- corresponding to different implementations and exclusive usage each other. - -- The implementation depends of national regulations or LEA/CSP negotiations. - -- 3GPP HI1 may be used with other services/networks than 3GPP’s one. - + -- The implementation depends of national regulations or LEA/CSP negotiations. + -- 3GPP HI1 may be used with other services/networks than 3GPP's one. -- from TS 101 909-20-1 [33] TARGETACTIVITYMONITOR-1, @@ -170,13 +168,13 @@ IMPORTS -- from J-STD-025-B [39] LAESProtocol - FROM Laesp-j-std-025-b + FROM Laesp-j-std-025-b {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) j-std-025(0) j-std-025-b(2) version-1(0)} CDMA2000LAESMessage - FROM CDMA2000CIIModule + FROM CDMA2000CIIModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cii(0) version-2(1)} CCIPPacketHeader - FROM CDMA2000CCModule + FROM CDMA2000CCModule {iso(1) member-body(2) us(840) tia(113737) laes(2) tr45(0) cdma2000(1) cc(1) version-1(0)}; -- end of IMPORTS @@ -187,7 +185,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) version24(24)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version25(25)} -- ==================== -- Top-level definition @@ -205,7 +203,7 @@ PSHeader ::= SEQUENCE lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, authorizationCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.3 - communicationIdentifier [3] CommunicationIdentifier, + communicationIdentifier [3] CommunicationIdentifier, sequenceNumber [4] INTEGER (0..4294967295), timeStamp [5] GeneralizedTime OPTIONAL, -- see clause 5.2.6 @@ -227,7 +225,6 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer, threeGPP-HI1-Operation [5] ThreeGPP-HI1-Operation -- This structure may be functionally redundant with hI1-Operation from TS 101 671 - } TimeStampQualifier ::= ENUMERATED @@ -248,7 +245,7 @@ CommunicationIdentifier ::= SEQUENCE networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, -- in case of transport of HI1 messages not required - -- Mandatory for CC and IRI, with certain exceptions (see 5.2.4) + -- Mandatory for CC and IRI, with certain exceptions (see clause 5.2.4) deliveryCountryCode [2] PrintableString (SIZE (2)) OPTIONAL, -- see clause 5.2.4 ..., @@ -314,7 +311,7 @@ CCContents ::= CHOICE 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, + 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, @@ -335,24 +332,23 @@ MicroSecondTimeStamp ::= SEQUENCE IRIPayload ::= SEQUENCE { - iRIType [0] IRIType OPTIONAL, + iRIType [0] IRIType OPTIONAL, -- See clause 5.2.10 - timeStamp [1] GeneralizedTime OPTIONAL, + timeStamp [1] GeneralizedTime OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - iRIContents [2] IRIContents, + iRIContents [2] IRIContents, ..., microSecondTimeStamp [3] MicroSecondTimeStamp OPTIONAL, -- For aggregated payloads (see clause 6.2.3) - timeStampQualifier [4] TimeStampQualifier OPTIONAL, - sessionDirection [5] PayloadDirection OPTIONAL, - -- If the sessionDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + timeStampQualifier [4] TimeStampQualifier OPTIONAL, + sessionDirection [5] PayloadDirection OPTIONAL, + -- If the sessionDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details - payloadDirection [6] PayloadDirection OPTIONAL - -- If the payloadDirection field is to be used for a given service then - -- the exact meaning and use of the field will be described in the + payloadDirection [6] PayloadDirection OPTIONAL + -- If the payloadDirection field is to be used for a given service then + -- the exact meaning and use of the field will be described in the -- relevant service-specific details - } IRIType ::= ENUMERATED @@ -426,7 +422,7 @@ ProSeIRI ::= CHOICE -- This structure may be commented out if not used { iRI-ProSe-Parameters [0] ProSeHI2Operations.IRI-Parameters, - proseIRIsContent [1] ProSeIRIsContent, + proseIRIsContent [1] ProSeIRIsContent, ... } @@ -435,7 +431,7 @@ GcseIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Gcse-Parameters [0] GCSEHI2Operations.IRI-Parameters, - gcseIRIsContent [1] GCSEIRIsContent, + gcseIRIsContent [1] GcseIRIsContent, ... } @@ -474,14 +470,19 @@ IntegrityCheck ::= SEQUENCE -- (see clause 7.2.3) checkValue [3] OCTET STRING, -- Network byte order - -- In case of a DSA/DSS signature, the r and s values shall be concatenated - ... + -- 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]. + ..., + hashAlgorithm [4] HashAlgorithm OPTIONAL + -- Clarifies the hash function if checkType is hash(1). + -- If used, it shall be present for each checkType hash(1). } CheckType ::= ENUMERATED { hash(1), - -- SHA-1 hash value + -- hash value signature(2), -- DSS/DSA signature ... @@ -494,6 +495,20 @@ DataType ::= ENUMERATED ... } + +HashAlgorithm ::= ENUMERATED +{ + sHA-1(1), + -- Included for legacy/migration purposes only, not to be used for new implementations + sHA-256(2), + sHA-384(3), + sHA-512(4), + ... +} + + + + Option ::= CHOICE { pDUAcknowledgement [0] NULL, @@ -604,26 +619,26 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 1 (the present document) } --- ================== +-- =================================== -- Common Parameters --- ================== +-- =================================== Location ::= SEQUENCE -- This is a common parameter, the use of this parameter is described in clause 4.5 { - umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, - epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, + umtsHI2Location [0] UmtsHI2Operations.Location OPTIONAL, + epsLocation [1] EpsHI2Operations.EPSLocation OPTIONAL, ..., wlanLocationAttributes [2] WlanLocationAttributes OPTIONAL - } WlanLocationAttributes ::= SEQUENCE { - wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, + wlanAPMACAddress [0] OCTET STRING (SIZE(6)) OPTIONAL, -- 48-bit (6 octet) MAC address of the WLAN access point derived from the BSSID ... -} +} + END --end of LI-PS-PDU -- GitLab