Commit acd95b34 authored by Steije van Schelt's avatar Steije van Schelt
Browse files

Merge branch 'cr/103120/118' into cr/104144/010

parents 32b15131 5491e0f6

103120/schema/xsd/ts_103120_Delivery.xsd

+2 −3
Original line number Diff line number Diff line
@@ -93,8 +93,7 @@ 
    </xs:complexType>

    <xs:complexType name="DeliveryEncryptionDetails">

        <xs:sequence>

            <xs:element name="EncryptionScheme" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="EncryptionCertificateFingerprint" type="etsi:ShortString" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="AdditionalInformation" type="etsi:LongString" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

103120/schema/xsd/ts_103120_Encryption.xsd

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:etsi="http://uri.etsi.org/03280/common/2017/07" xmlns:common="http://uri.etsi.org/03120/common/2016/02/Common" xmlns:core="http://uri.etsi.org/03120/common/2019/10/Core" xmlns="http://uri.etsi.org/03120/common/2026/01/Encryption" targetNamespace="http://uri.etsi.org/03120/common/2026/01/Encryption" elementFormDefault="qualified" attributeFormDefault="unqualified">

    <xs:import namespace="http://uri.etsi.org/03120/common/2016/02/Common"/>

    <xs:import namespace="http://uri.etsi.org/03120/common/2019/10/Core"/>

    <xs:import namespace="http://uri.etsi.org/03280/common/2017/07"/>

    <xs:complexType name="EncryptionObject">

        <xs:complexContent>

            <xs:extension base="core:HI1Object">

                <xs:sequence>

                    <xs:element name="EncryptionScheme" type="common:DictionaryEntry" minOccurs="1"/>

                    <xs:element name="X509EncryptionDetails" minOccurs="0"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="X509EncryptionDetails">

        <xs:sequence>

            <xs:element name="X509Certificates" type="X509Certificate" minOccurs="0" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="X509Certificate">

        <xs:sequence>

            <xs:element name="X509CertificateDER" type="xs:base64Binary" minOccurs="0"/>

        </xs:sequence>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Task.xsd

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ 
    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

            <xs:element name="DeliveryAddress" type="DeliveryAddress" minOccurs="0"/>

            <xs:element name="EncryptionReference" type="core:ObjectIdentifier" minOccurs="0"/>

            <xs:element name="EncryptionDetails" type="NationalEncryptionDetails" minOccurs="0"/>

            <xs:element name="LDHandoverFormat" type="common:DictionaryEntry" minOccurs="0"/>

            <xs:element name="LDDeliveryProfile" type="common:DictionaryEntry" minOccurs="0"/>

testing/xml/requirements.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
colorama

testing/xml/ts_104144_xsd.json

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
    "103120/schema/xsd/ts_103120_Delivery.xsd",

    "103120/dictionaries/ts_103120_Dictionaries.xsd",

    "103120/schema/xsd/ts_103120_Document.xsd",

    "103120/schema/xsd/ts_103120_Encryption.xsd",

    "103120/schema/xsd/ts_103120_Notification.xsd",

    "103120/schema/xsd/ts_103120_Task.xsd",

    "103120/schema/xsd/ts_103120_TrafficPolicy.xsd",