Commit 9c1d4957 authored by canterburym's avatar canterburym
Browse files

Updating 232-1 ASN.1 from meeting

parent 933f7d53
Pipeline #4919 passed with stage
in 7 seconds
......@@ -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).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment