Commit b55fae77 authored by canterburym's avatar canterburym
Browse files

Merge branch 'cr/33128/0553' into 'meeting/SA101' 

TS 33.128 CR0553 - Solution to allow the redaction of encapsulated information

See merge request !198
parents f78b375e 55fb019f

33128/r18/TS33128Payloads.asn

+86 −2
Original line number Diff line number Diff line
@@ -4039,7 +4039,14 @@ IMSCCPDUPayload ::= OCTET STRING 


IMSPayload ::= CHOICE

{

    encapsulatedSIPMessage            [1] SIPMessage

    encapsulatedSIPMessage            [1] SIPMessage,

    modifiedSIPMessage                [2] ModifiedSIPMessage

}



ModifiedSIPMessage ::= SEQUENCE

{

    modifiedSIPContent [1] SIPMessage,

    modifications      [2] PayloadModifications

}



SIPMessage ::= SEQUENCE
@@ -6691,7 +6698,8 @@ SIPCellularNetworkInformation ::= SEQUENCE 


RCSPayload ::= CHOICE

{

    fullPayload     [1] EncapsulatedRCSPayload

    fullPayload     [1] EncapsulatedRCSPayload,

    modifiedPayload [2] ModifiedRCSPayload

}



EncapsulatedRCSPayload ::= CHOICE
@@ -6701,6 +6709,82 @@ EncapsulatedRCSPayload ::= CHOICE 
    sIP  [3] SIPMessage

}



ModifiedRCSPayload ::= SEQUENCE

{

    modifiedRCSPayload [1] EncapsulatedRCSPayload,

    modifications      [2] PayloadModifications

}



PayloadModifications ::= SEQUENCE

{

    modificationList [1] SEQUENCE OF PayloadModification

}



PayloadModification ::= CHOICE

{

    predefinedModification [1] PredefinedPayloadModification,

    describedModification  [2] PayloadModificationDescription

}



PredefinedPayloadModification ::= ENUMERATED

{

    pANILocationRemoval(1),

    cNILocationRemoval(2),

    sIPGeolocationInfoRemoval(3),

    presenceInformationLocationRemoval(4),

    tS33128SMSTPDURedaction(5),

    tS33128TruncatedSMSTPDU(6),

    iMSTextContentRemoval(7),

    iMSSubjectContentRemoval(8)

}



PayloadModificationDescription ::= SEQUENCE

{

    modificationLocation [1] ModificationLocation,

    modificationType     [2] ModificationType

}



ModificationLocation ::= CHOICE

{

    jSONPointer        [1] UTF8String,

    xPath              [2] UTF8String,

    sIPHeader          [3] UTF8String,

    sIPBody            [4] NULL,

    mIMEHeader         [5] UTF8String,

    mIMEBody           [6] MIMEBody,

    uTF8Location       [7] IndexRange,

    octetLocation      [8] IndexRange,

    aBNFRule           [9] ABNFRuleLocation

}



ABNFRuleLocation ::= UTF8String



ModificationType ::= CHOICE

{

    removed                  [1] PayloadInformationRemoved,

    replacedWithCharacters   [2] PayloadInformationReplacedWithCharacters,

    replacedWithOctets       [3] OCTET STRING,

    replacedWithBits         [4] BIT STRING

}



PayloadInformationRemoved ::= CHOICE

{

    charactersRemoved [1] INTEGER,

    octetsRemoved     [2] INTEGER,

    bitsRemoved       [3] INTEGER

}



PayloadInformationReplacedWithCharacters ::= SEQUENCE

{

    characters [1] UTF8String

}



IndexRange ::= SEQUENCE

{

    start [1] INTEGER,

    end   [2] INTEGER

}



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

-- Externally Defined Structures - MSRP Parameters

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