diff --git a/102232-1/LI-PS-PDU.asn b/102232-1/LI-PS-PDU.asn index 41bb6d83cd3137dbe61c460f0641a84dd204a142..31457fab04c2f3825e41ed7419b440db49785960 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) version14(14)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -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) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} -- from TS 102 232-03 [6] IPCC, @@ -113,7 +113,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) version14(14)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} -- ==================== -- Top-level definition @@ -185,7 +185,7 @@ NetworkIdentifier ::= SEQUENCE networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, ..., eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID } -- ========================== @@ -221,11 +221,9 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, emailCC [1] EmailCC, iPCC [2] IPCC, uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, ..., l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, @@ -272,7 +270,6 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { - undefinedIRI [0] OCTET STRING, emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly, diff --git a/102232-1/portal/LI-PS-PDU,ver14.txt b/102232-1/portal/LI-PS-PDU,ver15.txt similarity index 97% rename from 102232-1/portal/LI-PS-PDU,ver14.txt rename to 102232-1/portal/LI-PS-PDU,ver15.txt index 41bb6d83cd3137dbe61c460f0641a84dd204a142..31457fab04c2f3825e41ed7419b440db49785960 100644 --- a/102232-1/portal/LI-PS-PDU,ver14.txt +++ b/102232-1/portal/LI-PS-PDU,ver15.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) version14(14)} +{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version15(15)} DEFINITIONS IMPLICIT TAGS ::= @@ -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) version9(9)} + {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) email(2) version10(10)} -- from TS 102 232-03 [6] IPCC, @@ -113,7 +113,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) version14(14)} +li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version15(15)} -- ==================== -- Top-level definition @@ -185,7 +185,7 @@ NetworkIdentifier ::= SEQUENCE networkElementIdentifier [1] OCTET STRING (SIZE(1..16)) OPTIONAL, ..., eTSI671NEID [2] Network-Element-Identifier OPTIONAL - -- For Network Element Identifier, use either OCTET STRING or ETSI671 definition + -- For network element identifier, use either networkElementIdentifier or eTSI671NEID } -- ========================== @@ -221,11 +221,9 @@ PayloadDirection ::= ENUMERATED CCContents ::= CHOICE -- Any of these choices may be commented out if they are not being used, see clause A.3 { - undefinedCC [0] OCTET STRING, emailCC [1] EmailCC, iPCC [2] IPCC, uMTSCC [4] OCTET STRING, - eTSI671CC [5] OCTET STRING, ..., l2CC [6] L2CC, tTRAFFIC-1 [7] TS101909201.TTRAFFIC, @@ -272,7 +270,6 @@ IRIType ::= ENUMERATED IRIContents ::= CHOICE -- Any of these choices may be commented out if they are not being used (see clause A.3) { - undefinedIRI [0] OCTET STRING, emailIRI [1] EmailIRI, iPIRI [2] IPIRI, iPIRIOnly [3] IPIRIOnly,