diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index beb3f35e1b4db72202ef586d1290a0b26e247531..41bb6d83cd3137dbe61c460f0641a84dd204a142 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) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,12 +9,12 @@ IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) -- from TS 101 671 [4] - LawfulInterceptionIdentifier, - IRI-Parameters, + LawfulInterceptionIdentifier, + IRI-Parameters, IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} -- from TS 102 232-03 [6] IPCC, @@ -113,19 +113,19 @@ 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) version13(13)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} -- ==================== -- Top-level definition -- ==================== -PS-PDU ::= SEQUENCE +PS-PDU ::= SEQUENCE { pSHeader [1] PSHeader, payload [2] Payload } -PSHeader ::= SEQUENCE +PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, @@ -153,7 +153,7 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer } -TimeStampQualifier ::= ENUMERATED +TimeStampQualifier ::= ENUMERATED { unknown(0), timeOfInterception(1), @@ -165,7 +165,7 @@ TimeStampQualifier ::= ENUMERATED -- Items contained within the PS-Header -- ==================================== -CommunicationIdentifier ::= SEQUENCE +CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, @@ -179,7 +179,7 @@ CommunicationIdentifier ::= SEQUENCE -- a particular session (see clause 5.2.4) } -NetworkIdentifier ::= SEQUENCE +NetworkIdentifier ::= SEQUENCE { operatorIdentifier [0] OCTET STRING (SIZE(1..16)), networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, @@ -192,7 +192,7 @@ NetworkIdentifier ::= SEQUENCE -- Definitions for CC Payload -- ========================== -CCPayload ::= SEQUENCE +CCPayload ::= SEQUENCE { payloadDirection [0] PayloadDirection OPTIONAL, timeStamp [1] GeneralizedTime OPTIONAL, @@ -235,8 +235,8 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -261,7 +261,7 @@ IRIPayload ::= SEQUENCE ... } -IRIType ::= ENUMERATED +IRIType ::= ENUMERATED { iRI-Begin(1), iRI-End(2), @@ -269,7 +269,7 @@ IRIType ::= ENUMERATED iRI-Report(4) } -IRIContents ::= CHOICE +IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { undefinedIRI [0] OCTET STRING, @@ -287,11 +287,11 @@ IRIContents ::= CHOICE iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } -UMTSIRI ::= CHOICE +UMTSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, @@ -301,7 +301,7 @@ UMTSIRI ::= CHOICE umtsCS-IRIsContent [3] UmtsCS-IRIsContent } -ETSI671IRI ::= CHOICE +ETSI671IRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] HI2Operations.IRI-Parameters, @@ -309,11 +309,11 @@ ETSI671IRI ::= CHOICE ... } -EPSIRI ::= CHOICE - -- This structure may be commented out if not used +EPSIRI ::= CHOICE + -- This structure may be commented out if not used { - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, ... } @@ -321,7 +321,7 @@ EPSIRI ::= CHOICE -- Definitions for TRI Payload -- =========================== -TRIPayload ::= CHOICE +TRIPayload ::= CHOICE { integrityCheck [0] IntegrityCheck, testPDU [1] NULL, @@ -336,7 +336,7 @@ TRIPayload ::= CHOICE operatorLeaMessage [8] OperatorLeaMessage } -IntegrityCheck ::= SEQUENCE +IntegrityCheck ::= SEQUENCE { includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), -- gives the order the PDUs were processed @@ -350,7 +350,7 @@ IntegrityCheck ::= SEQUENCE ... } -CheckType ::= ENUMERATED +CheckType ::= ENUMERATED { hash(1), -- SHA-1 hash value @@ -359,7 +359,7 @@ CheckType ::= ENUMERATED ... } -DataType ::= ENUMERATED +DataType ::= ENUMERATED { iRI(1), cC(2), @@ -370,14 +370,14 @@ DataType ::= ENUMERATED -- Definitions for OperatorLeaMessage -- ================================== -OperatorLeaMessage ::= SEQUENCE +OperatorLeaMessage ::= SEQUENCE { messagePriority [0] OperatorLeaMessagePriority, message [1] OCTET STRING (SIZE(1..255)), ... } -OperatorLeaMessagePriority ::= ENUMERATED +OperatorLeaMessagePriority ::= ENUMERATED { error(1), -- reporting of error conditions that have impact on the quality of the @@ -388,11 +388,11 @@ OperatorLeaMessagePriority ::= ENUMERATED ... } --- ================================ +-- =================================== -- Definitions for EncryptionContainer --- ================================ +-- =================================== -EncryptionContainer ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, @@ -401,7 +401,7 @@ EncryptionContainer ::= SEQUENCE encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } -EncryptionType ::= ENUMERATED +EncryptionType ::= ENUMERATED { none(1), -- No encryption is applied. @@ -420,14 +420,14 @@ EncryptionType ::= ENUMERATED ... } -EncryptedPayload ::= SEQUENCE +EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) - -- as defined in Annex I: + -- as defined in annex G: -- IF N > 0 THEN -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) -- ELSE @@ -437,11 +437,9 @@ EncryptedPayload ::= SEQUENCE ... } -EncryptedPayloadType ::= ENUMERATED +EncryptedPayloadType ::= ENUMERATED { - unknown(0), - part1(1), - -- encrypted payload is TS 102 232 part 1 + unknown(1), part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -454,8 +452,9 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 6 [36] part7(7), -- encrypted payload is TS 102 232 part 7 [38] - ... + ..., + part1(8) + -- encrypted payload is TS 102 232 part 1 (the present document) } END --end of LI-PS-PDU - diff --git a/102232-1/portal/LI-PS-PDU,ver13.txt b/102232-1/portal/LI-PS-PDU,ver14.txt similarity index 89% rename from 102232-1/portal/LI-PS-PDU,ver13.txt rename to 102232-1/portal/LI-PS-PDU,ver14.txt index beb3f35e1b4db72202ef586d1290a0b26e247531..41bb6d83cd3137dbe61c460f0641a84dd204a142 100644 --- a/102232-1/portal/LI-PS-PDU,ver13.txt +++ b/102232-1/portal/LI-PS-PDU,ver14.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) version13(13)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version14(14)} DEFINITIONS IMPLICIT TAGS ::= @@ -9,12 +9,12 @@ IMPORTS -- Any of the IMPORTs may be commented out if they are not used (see clause A.3) -- from TS 101 671 [4] - LawfulInterceptionIdentifier, - IRI-Parameters, + LawfulInterceptionIdentifier, + IRI-Parameters, IRIsContent, Network-Element-Identifier FROM HI2Operations - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version14(14)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) hi2(1) version17(17)} -- from TS 101 671 [4] HI1-Operation @@ -27,7 +27,7 @@ IMPORTS MessagingCC, MessagingIRI FROM EmailPDU - {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version8(8)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version9(9)} -- from TS 102 232-03 [6] IPCC, @@ -113,19 +113,19 @@ 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) version13(13)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version14(14)} -- ==================== -- Top-level definition -- ==================== -PS-PDU ::= SEQUENCE +PS-PDU ::= SEQUENCE { pSHeader [1] PSHeader, payload [2] Payload } -PSHeader ::= SEQUENCE +PSHeader ::= SEQUENCE { li-psDomainId [0] OBJECT IDENTIFIER, lawfulInterceptionIdentifier [1] LawfulInterceptionIdentifier, @@ -153,7 +153,7 @@ Payload ::= CHOICE encryptionContainer [4] EncryptionContainer } -TimeStampQualifier ::= ENUMERATED +TimeStampQualifier ::= ENUMERATED { unknown(0), timeOfInterception(1), @@ -165,7 +165,7 @@ TimeStampQualifier ::= ENUMERATED -- Items contained within the PS-Header -- ==================================== -CommunicationIdentifier ::= SEQUENCE +CommunicationIdentifier ::= SEQUENCE { networkIdentifier [0] NetworkIdentifier, communicationIdentityNumber [1] INTEGER (0..4294967295) OPTIONAL, @@ -179,7 +179,7 @@ CommunicationIdentifier ::= SEQUENCE -- a particular session (see clause 5.2.4) } -NetworkIdentifier ::= SEQUENCE +NetworkIdentifier ::= SEQUENCE { operatorIdentifier [0] OCTET STRING (SIZE(1..16)), networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, @@ -192,7 +192,7 @@ NetworkIdentifier ::= SEQUENCE -- Definitions for CC Payload -- ========================== -CCPayload ::= SEQUENCE +CCPayload ::= SEQUENCE { payloadDirection [0] PayloadDirection OPTIONAL, timeStamp [1] GeneralizedTime OPTIONAL, @@ -235,8 +235,8 @@ CCContents ::= CHOICE pstnIsdnCC [11] PstnIsdnCC, iPMMCC [12] IPMMCC, cCIPPacketHeader [13] CDMA2000CCModule.CCIPPacketHeader, - messagingCC [14] MessagingCC, - ePSCC [15] OCTET STRING + messagingCC [14] MessagingCC, + ePSCC [15] OCTET STRING } MicroSecondTimeStamp ::= SEQUENCE @@ -261,7 +261,7 @@ IRIPayload ::= SEQUENCE ... } -IRIType ::= ENUMERATED +IRIType ::= ENUMERATED { iRI-Begin(1), iRI-End(2), @@ -269,7 +269,7 @@ IRIType ::= ENUMERATED iRI-Report(4) } -IRIContents ::= CHOICE +IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { undefinedIRI [0] OCTET STRING, @@ -287,11 +287,11 @@ IRIContents ::= CHOICE iPMMIRI [11] IPMMIRI, lAESProtocol [12] Laesp-j-std-025-b.LAESProtocol, cDMA2000LAESMessage [13] CDMA2000CIIModule.CDMA2000LAESMessage, - messagingIRI [14] MessagingIRI, - ePSIRI [15] EPSIRI + messagingIRI [14] MessagingIRI, + ePSIRI [15] EPSIRI } -UMTSIRI ::= CHOICE +UMTSIRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] UmtsHI2Operations.IRI-Parameters, @@ -301,7 +301,7 @@ UMTSIRI ::= CHOICE umtsCS-IRIsContent [3] UmtsCS-IRIsContent } -ETSI671IRI ::= CHOICE +ETSI671IRI ::= CHOICE -- This structure may be commented out if not used { iRI-Parameters [0] HI2Operations.IRI-Parameters, @@ -309,11 +309,11 @@ ETSI671IRI ::= CHOICE ... } -EPSIRI ::= CHOICE - -- This structure may be commented out if not used +EPSIRI ::= CHOICE + -- This structure may be commented out if not used { - iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, - epsIRIsContent [1] EpsIRIsContent, + iRI-EPS-Parameters [0] EpsHI2Operations.IRI-Parameters, + epsIRIsContent [1] EpsIRIsContent, ... } @@ -321,7 +321,7 @@ EPSIRI ::= CHOICE -- Definitions for TRI Payload -- =========================== -TRIPayload ::= CHOICE +TRIPayload ::= CHOICE { integrityCheck [0] IntegrityCheck, testPDU [1] NULL, @@ -336,7 +336,7 @@ TRIPayload ::= CHOICE operatorLeaMessage [8] OperatorLeaMessage } -IntegrityCheck ::= SEQUENCE +IntegrityCheck ::= SEQUENCE { includedSequenceNumbers [0] SEQUENCE OF INTEGER (0..4294967295), -- gives the order the PDUs were processed @@ -350,7 +350,7 @@ IntegrityCheck ::= SEQUENCE ... } -CheckType ::= ENUMERATED +CheckType ::= ENUMERATED { hash(1), -- SHA-1 hash value @@ -359,7 +359,7 @@ CheckType ::= ENUMERATED ... } -DataType ::= ENUMERATED +DataType ::= ENUMERATED { iRI(1), cC(2), @@ -370,14 +370,14 @@ DataType ::= ENUMERATED -- Definitions for OperatorLeaMessage -- ================================== -OperatorLeaMessage ::= SEQUENCE +OperatorLeaMessage ::= SEQUENCE { messagePriority [0] OperatorLeaMessagePriority, message [1] OCTET STRING (SIZE(1..255)), ... } -OperatorLeaMessagePriority ::= ENUMERATED +OperatorLeaMessagePriority ::= ENUMERATED { error(1), -- reporting of error conditions that have impact on the quality of the @@ -388,11 +388,11 @@ OperatorLeaMessagePriority ::= ENUMERATED ... } --- ================================ +-- =================================== -- Definitions for EncryptionContainer --- ================================ +-- =================================== -EncryptionContainer ::= SEQUENCE +EncryptionContainer ::= SEQUENCE { encryptionType [0] EncryptionType, encryptedPayload [1] OCTET STRING, @@ -401,7 +401,7 @@ EncryptionContainer ::= SEQUENCE encryptedPayloadType [2] EncryptedPayloadType OPTIONAL } -EncryptionType ::= ENUMERATED +EncryptionType ::= ENUMERATED { none(1), -- No encryption is applied. @@ -420,14 +420,14 @@ EncryptionType ::= ENUMERATED ... } -EncryptedPayload ::= SEQUENCE +EncryptedPayload ::= SEQUENCE { byteCounter [0] INTEGER (0..18446744073709551615), -- The sum of the sizes of all PDUs before this PDU. -- It is initialized with the unixTime (number of seconds since 01-01-1970) -- multiplied by 2^32 at first use. -- Where N is sequencenumber of the n-th PDU in transfer, and size(PDU(N)) - -- as defined in Annex I: + -- as defined in annex G: -- IF N > 0 THEN -- PDU[N].byteCounter = PDU[N-1].byteCounter + size(PDU[N-1]) -- ELSE @@ -437,11 +437,9 @@ EncryptedPayload ::= SEQUENCE ... } -EncryptedPayloadType ::= ENUMERATED +EncryptedPayloadType ::= ENUMERATED { - unknown(0), - part1(1), - -- encrypted payload is TS 102 232 part 1 + unknown(1), part2(2), -- encrypted payload is TS 102 232 part 2 [5] part3(3), @@ -454,8 +452,9 @@ EncryptedPayloadType ::= ENUMERATED -- encrypted payload is TS 102 232 part 6 [36] part7(7), -- encrypted payload is TS 102 232 part 7 [38] - ... + ..., + part1(8) + -- encrypted payload is TS 102 232 part 1 (the present document) } END --end of LI-PS-PDU -