Commit 96a0cea6 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Merge branch 'cr/103120/132' into 'meeting/LI73'

TS 103 120 CR132 - Corrections and clarifications

See merge request !322
parents b2d1946e 6ebb13a0
Loading
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@
                            </task:CSPID>
                            <task:Deadlines>
                                <task:TakedownDeadline>
                                    <task:DateTime>2026-02-01:12:00:00Z</task:DateTime>
                                    <task:DateTime>2026-02-01T12:00:00Z</task:DateTime>
                                    <task:NatureOfDeadline>
                                        <common:Owner>ETSI</common:Owner>
                                        <common:Name>TDNatureOfDeadline</common:Name>
+7 −0
Original line number Diff line number Diff line
@@ -260,6 +260,13 @@
        },
        "delivery:Checksums": {
          "$ref": "ts_103120_Common_2016_02#/$defs/ListOfChecksumAndType"
        },
        "delivery:OriginalFilename": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "delivery:ContentLength": {
          "type": "integer",
          "minimum": 0
        }
      },
      "required": [
+78 −0
Original line number Diff line number Diff line
{
  "$id": "ts_103120_Encryption_2026_01",
  "$schema": "https://json-schema.org/draft/2020-12/schema",
  "$defs": {
    "EncryptionObject": {
      "type": "object",
      "properties": {
        "@xsi:type": {
          "type": "string",
          "enum": [
            "{http://uri.etsi.org/03120/common/2026/01/Encryption}EncryptionObject"
          ]
        },
        "ObjectIdentifier": {
          "$ref": "ts_103120_Core_2019_10#/$defs/ObjectIdentifier"
        },
        "CountryCode": {
          "$ref": "ts_103280_2017_07#/$defs/ISOCountryCode"
        },
        "OwnerIdentifier": {
          "$ref": "ts_103280_2017_07#/$defs/ShortString"
        },
        "Generation": {
          "type": "integer",
          "minimum": 0
        },
        "ExternalIdentifier": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "AssociatedObjects": {
          "$ref": "ts_103120_Core_2019_10#/$defs/AssociatedObjects"
        },
        "LastChanged": {
          "$ref": "ts_103280_2017_07#/$defs/QualifiedDateTime"
        },
        "NationalHandlingParameters": {
          "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters"
        },
        "encryption:EncryptionScheme": {
          "$ref": "ts_103120_Common_2016_02#/$defs/DictionaryEntry"
        },
        "encryption:X509EncryptionDetails": {
          "$ref": "#/$defs/X509EncryptionDetails"
        }
      },
      "required": [
        "@xsi:type",
        "ObjectIdentifier",
        "encryption:EncryptionScheme"
      ],
      "additionalProperties": false
    },
    "X509EncryptionDetails": {
      "type": "object",
      "properties": {
        "encryption:X509Certificates": {
          "type": "array",
          "items": {
            "$ref": "#/$defs/X509Certificate"
          }
        }
      },
      "required": [],
      "additionalProperties": false
    },
    "X509Certificate": {
      "type": "object",
      "properties": {
        "encryption:X509CertificateDER": {
          "type": "string",
          "pattern": "^[A-Za-z0-9+\\/]*={0,3}$"
        }
      },
      "required": [],
      "additionalProperties": false
    }
  }
}
+3 −4
Original line number Diff line number Diff line
@@ -867,9 +867,6 @@
        "NationalHandlingParameters": {
          "$ref": "ts_103120_Core_2019_10#/$defs/NationalHandlingParameters"
        },
        "task:Reference": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
        "task:RequesterReference": {
          "$ref": "ts_103280_2017_07#/$defs/LongString"
        },
@@ -972,7 +969,9 @@
      "properties": {
        "task:TakedownDeadline": {
          "type": "array",
          "items": {}
          "items": {
            "$ref": "#/$defs/TakedownDeadline"
          }
        }
      },
      "required": [],
+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
        <xs:sequence>
            <xs:element name="Header" type="MessageHeader"/>
            <xs:element name="Payload" type="MessagePayload"/>
            <!-- nolint: accept untyped element -->
            <xs:element name="Signature" minOccurs="0"/>
            <!-- Use of the Signature element is discouraged – implementers are encouraged use the digsig:Signature element below instead -->
            <xs:element ref="digsig:Signature" minOccurs="0"/>
Loading