Commit 2d521e8c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'meeting/LI66' into 'main' 

Output of LI#66

See merge request !139
parents eb9f99fe ff4103cf

102232-1/LI-PS-PDU.asn

+19 −5
Original line number Diff line number Diff line 
LI-PS-PDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version38(38)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -39,7 +39,8 @@ IMPORTS 
    -- from ETSI TS 102 232-3 [6]

    IPCC,

    IPIRI,

    IPIRIOnly

    IPIRIOnly,

    IPIRIPacketReport

        FROM IPAccessPDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}
@@ -205,7 +206,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) version37(37)}

li-psDomainId OBJECT IDENTIFIER ::= {lawfulInterceptDomainId li-ps(5) genHeader(1) version38(38)}



-- ====================

-- Top-level definition
@@ -421,7 +422,8 @@ 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),

    iPIRIPacketReport           [20] IPAccessPDU.IPIRIPacketReport

}



UMTSIRI ::= CHOICE
@@ -515,9 +517,12 @@ IntegrityCheck ::= SEQUENCE 
        -- 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.

    ...,

    hashAlgorithm               [4] HashAlgorithm OPTIONAL

    hashAlgorithm               [4] HashAlgorithm OPTIONAL,

        -- Clarifies the hash function if checkType is hash(1).

        -- If used, it shall be present for each checkType hash(1).

    signatureAlgorithm          [5] SignatureAlgorithm OPTIONAL

        -- Clarifies the signature algorithm if checkType is signature(2).

        -- If used, it shall be present for each checkType signature(2).

}



CheckType ::= ENUMERATED
@@ -547,6 +552,15 @@ HashAlgorithm ::= ENUMERATED 
    ...

}



SignatureAlgorithm ::= ENUMERATED

{

    dSA(1),

        -- Included for legacy/migration purposes only, not to be used for new implementations

    eCDSA(2),

    edDSA(3),

    ...

}



Option ::= CHOICE

{

    pDUAcknowledgement  [0] NULL,

102232-3/IPAccessPDU.asn

+75 −4
Original line number Diff line number Diff line 
IPAccessPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version17(17)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPAccess(3) version18(18)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,17 +9,18 @@ IMPORTS 
    IPAddress,

    Location

        FROM LI-PS-PDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)};

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version38(38)};





-- ============================

-- Object Identifier Definition

-- ============================



iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version17(17)}

iPAccessPDUObjId RELATIVE-OID               ::= {li-ps(5) iPAccess(3) version18(18)}

iPIRIObjId RELATIVE-OID                     ::= {iPAccessPDUObjId iRI(1)}

iPCCObjId RELATIVE-OID                      ::= {iPAccessPDUObjId cC(2)}

iPIRIOnlyObjId RELATIVE-OID                 ::= {iPAccessPDUObjId iRIOnly(3)}

iPIRIPacketReportObjId RELATIVE-OID         ::= {iPAccessPDUObjId iRIPacketReport(4)}



    -- definitions are relative to

    -- {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulintercept(2)}
@@ -270,11 +271,14 @@ FramedRoute ::= CHOICE 
    ...

}





-- =====================================================

-- Intercept-related information for IRI-Only intercepts

-- =====================================================



-- The PDHR and PDSR mechanisms have been superseded by

-- the IPPR mechanism which is defined in clause 6.2.5.

-- New implementations should use the IPPR mechanism.



IPIRIOnly ::= SEQUENCE

{

    iPIRIOnlyObjId              [0] RELATIVE-OID,
@@ -371,5 +375,72 @@ PDSRSummaryTrigger ::= ENUMERATED 
    ...

}



-- ===================================================

-- Intercept-related information for IP Packet Reports

-- ===================================================



IPIRIPacketReport ::= SEQUENCE

{

    iPIRIPacketReportObjId [0] RELATIVE-OID,

    report                 [1] PacketReport,

    ...

}



PacketReport ::= CHOICE

{

    header  [1] PacketReportHeader,

    summary [2] PacketReportSummary,

    ...

}



PacketReportHeader ::= SEQUENCE

{

    header [1] OCTET STRING,

    ...

}



PacketReportSummary ::= SEQUENCE

{

    header         [1] OCTET STRING,

    indications    [2] PacketReportIndications,

    trigger        [3] PacketReportTrigger,

    packetCount    [4] INTEGER OPTIONAL,

    byteCount      [5] INTEGER OPTIONAL,

    firstTimestamp [6] GeneralizedTime OPTIONAL,

    lastTimestamp  [7] GeneralizedTime OPTIONAL,

    ...

}



PacketReportTrigger ::= ENUMERATED

{

    flowStart(1),

    flowEnd(2),

    flowTimeout(3),

    flowTimerExpiration(4),

    flowPacketCount(5),

    flowByteCount(6),

    sessionTimerExpiration(7),

    sessionPacketCount(8),

    sessionByteCount(9),

    reportEnd(10),

    ...

}



PacketReportIndications ::= BIT STRING

{

    zeroedIPv4TotalLength(0),

    zeroedIPv4Flags(1),

    zeroedIPv4TimeToLive(2),

    zeroedIPv4HeaderChecksum(3),

    zeroedIPv6PayloadLength(4),

    removedIPv6ExtensionHeaders(5),

    zeroedTCPSequenceNumber(6),

    zeroedTCPAcknowledgementNumber(7),

    zeroedTCPFlags(8),

    zeroedTCPWindowSize(9),

    zeroedTCPChecksum(10),

    zeroedUDPLength(11),

    zeroedUDPChecksum(12)

}



END -- end of IPAccessPDU

102232-5/IPMultimediaPDU.asn

+7 −4
Original line number Diff line number Diff line 
IPMultimediaPDU

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version16(16)}

{itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) iPMultimedia(5) version17(17)}



DEFINITIONS IMPLICIT TAGS ::=

BEGIN
@@ -9,7 +9,7 @@ IMPORTS 
    IPAddress,

    Location

        FROM LI-PS-PDU

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version35(35)};

        {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) lawfulIntercept(2) li-ps(5) genHeader(1) version37(37)};
@@ -17,7 +17,7 @@ IMPORTS 
-- Object Identifier Definition

-- ============================



iPMultimediaPDUObjId RELATIVE-OID   ::= {li-ps(5) iPMultimedia(5) version16(16)}

iPMultimediaPDUObjId RELATIVE-OID   ::= {li-ps(5) iPMultimedia(5) version17(17)}

iPMMIRIObjId RELATIVE-OID           ::= {iPMultimediaPDUObjId iRI(1)}

iPMMCCObjId RELATIVE-OID            ::= {iPMultimediaPDUObjId cC(2)}
@@ -120,10 +120,13 @@ IPIRIContents ::= CHOICE 
    iRIOnlyOriginalIPMMMessage  [5] OCTET STRING,

        -- Copy of the IP MM signalling packet including the original IP and UDP/TCP headers

        -- see clause 5.2.6.

    iRIOnlySIPMessage           [6] SIPMessage

    iRIOnlySIPMessage           [6] SIPMessage,

        -- Copy of the SIP content and the source and destination IP address of the intercepted

        -- SIP message as transmitted on the network layer.

        -- (see clause 5.2.6 and 5.2.7).

    iRIOnlyRTPPacket            [7] OCTET STRING

        -- Copy of the RTP packet containing telephony events including the original IP and UDP headers

        -- (see clause 5.2.8.1).

}



SIPMessage ::= SEQUENCE

102657/RDMessage.asn

+28 −3
Original line number Diff line number Diff line 
RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version30(30)}

RDMessage {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3) rdHeader(0) version31(31)}



DEFINITIONS IMPLICIT TAGS ::=
@@ -12,7 +12,7 @@ BEGIN 
retainedDataDomainId OBJECT IDENTIFIER ::= {itu-t(0) identified-organization(4) etsi(0) securityDomain(2) retainedData(3)}



-- rdHeader

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version30(30)}

rdHeaderId OBJECT IDENTIFIER ::= {retainedDataDomainId rdHeader(0) version31(31)}



-- ======================================

-- Top level definitions for RDHI wrapper
@@ -1988,7 +1988,8 @@ MultimediaPartyInformation ::= SEQUENCE 
    octetsDownloaded                    [16] INTEGER OPTIONAL,

    accessNetworkInformation            [17] SEQUENCE OF AccessNetworkInfo OPTIONAL,

    privateUserIdentity                 [18] IMPI OPTIONAL,

    iMEI                                [19] IMEI OPTIONAL

    iMEI                                [19] IMEI OPTIONAL,

    cellularNetworkInfo                 [20] CellularNetworkInfo OPTIONAL

}



MultimediaCallID    ::= UTF8String
@@ -2110,6 +2111,30 @@ PaniHeaderInfo ::= SEQUENCE 
        -- Complete content of the P-Access-Network-Info header field

}



CellularNetworkInfo  ::= SEQUENCE

{

    accessType          [1] UTF8String OPTIONAL,

        -- ASCII string "3GPP-GERAN","3GPP-UTRAN-FDD", ... : see ETSI TS 124 229 [xx] clause 7.2.15.3

    cellularAccessInfo  [2] CellularAccessInfo OPTIONAL,

    cniHeaderContent    [3] UTF8String OPTIONAL,

        -- Complete content of the Cellular-Network-Info header field

    ...

}



CellularAccessInfo  ::= SEQUENCE

{

    cgi3gpp             [1] UTF8String OPTIONAL,

        -- cgi-3gpp parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    utranCellId3gpp     [2] UTF8String OPTIONAL,

        -- utran-cell-id-3gpp parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ci3gpp2             [3] UTF8String OPTIONAL,

        -- ci-3gpp2 parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ci3gpp2femto        [4] UTF8String OPTIONAL,

        -- ci-3gpp2-femto parameter in ASCII representation. See ETSI TS 124 229 [xx] clause 7.2.15.3

    cellInfoAge         [5] INTEGER OPTIONAL,

        -- cell-info-age parameter. See ETSI TS 124 229 [xx] clause 7.2.15.3

    ...

}



-- ==============================

-- Definitions of Billing Data

102657/RDMessage.xsd

+20 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.3.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.3.1#/RetainedData" elementFormDefault="qualified">

<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://uri.etsi.org/02657/v2.4.1#/RetainedData" targetNamespace="http://uri.etsi.org/02657/v2.4.1#/RetainedData" elementFormDefault="qualified">

    <xsd:annotation>

        <xsd:documentation xml:lang="en">

            XSD translated from ASN.1 derived from outcome of TS 102 657 v2.3.1

            XSD translated from ASN.1 derived from outcome of TS 102 657 v2.4.1

        </xsd:documentation>

    </xsd:annotation>

    <xsd:simpleType name="GeneralizedTime">
@@ -2961,6 +2961,7 @@ 
                    </xsd:choice>

                </xsd:complexType>

            </xsd:element>

            <xsd:element name="cellularNetworkInfo" type="CellularNetworkInfo" minOccurs="0"/>

            <xsd:element name="privateUserIdentity" type="IMPI" minOccurs="0"/>

            <xsd:element name="iMEI" type="IMEI" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>
@@ -3270,6 +3271,23 @@ 
            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:choice>

    </xsd:complexType>

    <xsd:complexType name="CellularNetworkInfo">

        <xsd:sequence>

            <xsd:element name="accessType" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cellularAccessInfo" type="CellularAccessInfo" minOccurs="0"/>

            <xsd:element name="cinHeaderContent" type="xsd:hexBinary" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:complexType name="CellularAccessInfo">

        <xsd:sequence>

            <xsd:element name="cgi3gpp" type="xsd:string" minOccurs="0"/>

            <xsd:element name="utranCellId3gpp" type="xsd:string" minOccurs="0"/>

            <xsd:element name="ci3gpp2" type="xsd:string" minOccurs="0"/>

            <xsd:element name="ci3gpp2femto" type="xsd:string" minOccurs="0"/>

            <xsd:element name="cellInfoAge" type="xsd:integer" minOccurs="0"/>

            <xsd:any namespace="##other" processContents="lax" minOccurs="0"/>

        </xsd:sequence>

    </xsd:complexType>

    <xsd:simpleType name="MultimediaDeviceID">

        <xsd:restriction base="xsd:hexBinary"/>

    </xsd:simpleType>