Commit 9b0732f7 authored by Gabriel Commeau's avatar Gabriel Commeau Committed by Mark Canterbury
Browse files

Update with revision 4. 

Adjust Encryption object, and use encryption object refrences instead.
parent b310b40e

103120/schema/xsd/ts_103120_Delivery.xsd

+3 −4
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:encryption="http://uri.etsi.org/03120/common/2026/01/Encryption" xmlns="http://uri.etsi.org/03120/common/2019/10/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" elementFormDefault="qualified" attributeFormDefault="unqualified">

<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/2019/10/Delivery" targetNamespace="http://uri.etsi.org/03120/common/2019/10/Delivery" 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/03120/common/2026/01/Encryption"/>
@@ -16,7 +16,7 @@ 
                    <xs:element name="Delivery" type="Delivery" minOccurs="0"/>

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

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

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -94,8 +94,7 @@ 
    </xs:complexType>

    <xs:complexType name="DeliveryEncryptionDetails">

        <xs:sequence>

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

            <xs:element name="EncryptionCertificateFingerprint" type="xs:hexBinary" 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

+4 −5
Original line number Diff line number Diff line
@@ -7,17 +7,16 @@ 
        <xs:complexContent>

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

                <xs:sequence>

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

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

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="X509EncryptionDetails">

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

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

    </xs:complexType>

    <xs:complexType name="EncryptionReference">

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

    <xs:complexType name="X509Certificate">

        <xs:element name="X509CertificateBytes" type="xs:base64Binary"/>

    </xs:complexType>

</xs:schema>

103120/schema/xsd/ts_103120_Task.xsd

+2 −2
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:encryption="http://uri.etsi.org/03120/common/2026/01/Encryption" xmlns="http://uri.etsi.org/03120/common/2020/09/Task" targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" elementFormDefault="qualified" attributeFormDefault="unqualified">

<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/2020/09/Task" targetNamespace="http://uri.etsi.org/03120/common/2020/09/Task" 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/03120/common/2026/01/Encryption"/>
@@ -167,7 +167,7 @@ 
    <xs:complexType name="LDDeliveryDestination">

        <xs:sequence>

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

            <xs:element name="EncryptionReference" type="encryption:EncryptionReference" 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"/>