Commit 19ebb595 authored by Biagio Maione's avatar Biagio Maione
Browse files

Replace ts_104000..xsd

parent 14701328

104000/schema/ts_104000..xsd

+122 −7
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ 
            <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>

            <xs:element name="version" type="Version"/>

            <xs:element name="x0TransactionId" type="X0TransactionId"/>

   <!-- messageType added START -->

            <xs:element name="messageType" type="MessageType"/>

   <!-- messageType added END -->

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="X0Response">
@@ -22,6 +25,10 @@ 
            <xs:element name="messageTimestamp" type="etsi103280:QualifiedMicrosecondDateTime"/>

            <xs:element name="version" type="Version"/>

            <xs:element name="x0TransactionId" type="X0TransactionId"/>

    <!-- messageType added START -->

            <xs:element name="messageType" type="MessageType"/>

    <!-- messageType added END -->



        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="AdmfIdentifier">
@@ -38,6 +45,19 @@ 
    <xs:simpleType name="X0TransactionId">

        <xs:restriction base="etsi103280:UUID"/>

    </xs:simpleType>

    <!-- messageType added START -->

	<xs:simpleType name="MessageType">

		<xs:restriction base="xs:string">

			<xs:enumeration value="RegistrationRequest"/>

			<xs:enumeration value="RegistrationResponse"/>

			<xs:enumeration value="ErrorResponse"/>

			<xs:enumeration value="XnCertEnrolmentRequest"/>

			<xs:enumeration value="XnCertEnrolmentResponse"/>

			<xs:enumeration value="ConfigurationRequest"/>

			<xs:enumeration value="ConfigurationResponse"/>

		</xs:restriction>

	</xs:simpleType>

    <!-- messageType added END -->

    <!-- See section 6.2.2 -->

    <xs:complexType name="ErrorResponse">

        <xs:complexContent>
@@ -87,6 +107,9 @@ 
            <xs:extension base="X0Response">

                <xs:sequence>

                    <xs:element name="assignedELID" type="EliIdentifier"/>

    <!-- chosenEnrolmentProtocol added START -->

                     <xs:element name="chosenEnrolmentProtocol" type="SupportedEnrolmentProtocol"/>       

    <!-- chosenEnrolmentProtocol added END -->            

                    <xs:element name="listOfCertificateEnrolmentDetails" type="ListOfCertificateEnrolmentDetails"/>

                </xs:sequence>

            </xs:extension>
@@ -119,7 +142,7 @@ 
            <xs:enumeration value="X3-server"/>

        </xs:restriction>

    </xs:simpleType>

    <!-- See section 6.2.3.2 -->

    <!-- See section 6.2.4.2 -->

    <xs:complexType name="XnCertEnrolmentResponse">

        <xs:complexContent>

            <xs:extension base="X0Response">
@@ -166,6 +189,7 @@ 
            </xs:extension>

        </xs:complexContent>

    </xs:complexType>



    <xs:complexType name="ListOfConfigurationDetails">

        <xs:sequence>

            <xs:element name="configurationDetails" type="ConfigurationDetails" maxOccurs="unbounded"/>
@@ -177,17 +201,49 @@ 
            <xs:element name="definitionIdentifier" type="etsi103280:ShortString"/>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="X0ConfigurationDetails">

        <xs:complexContent>

            <xs:extension base="ConfigurationDetails">

                <xs:sequence>

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

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

 <!-- REMOVED       <xs:element name="liEnabled" type="xs:boolean" minOccurs="0"/> -->

 <!-- REMOVED       <xs:element name="listOfADMFs" type="ListOfADMFs" minOccurs="0"/> -->

<!-- imageKeyDetails added START -->

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

<!-- imageKeyDetails added END -->

                 

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="ListOfADMFs">



<!-- ImageKeyDetails added START -->

    <xs:complexType name="ImageKeyDetails">

        <xs:sequence>

            <xs:element name="iMKindentifier" type="etsi103280:UUID"/>

            <xs:element name="iMKformat" type="IMKformat"/>

            <xs:element name="iMKvalue" type="xs:string"/>

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

        </xs:sequence>

    </xs:complexType>



    <xs:simpleType name="IMKformat">

		<xs:restriction base="xs:string">

			<xs:enumeration value="PKCS12BASE64"/>

			<xs:enumeration value="RAWBASE64"/>

		</xs:restriction>

	</xs:simpleType>



    <xs:simpleType name="Instruction">

		<xs:restriction base="xs:string">

			<xs:enumeration value="store"/>

			<xs:enumeration value="delete"/>

            <xs:enumeration value="roll-over"/>

		</xs:restriction>

	</xs:simpleType>

<!-- ImageKeyDetails added END -->



<!-- REMOVED   <xs:complexType name="ListOfADMFs">

        <xs:sequence>

            <xs:element name="admfDetails" type="ADMFDetails" maxOccurs="unbounded"></xs:element>

        </xs:sequence>
@@ -202,12 +258,71 @@ 
        <xs:sequence>

            <xs:element name="deliveryAddress" type="xs:anyURI" maxOccurs="unbounded"></xs:element>

        </xs:sequence>

    </xs:complexType> -->



<!-- See section 6.2.6.1 ADDED START-->   

    <xs:complexType name="NotificationRequest"> 

        <xs:complexContent>

            <xs:extension base="X0Request">

                <xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

<!-- See section 6.2.6.1 ADDED END-->   



<!-- See section 6.2.6.2 ADDED START-->   

    <xs:complexType name="NotificationResponse">

        <xs:complexContent>

            <xs:extension base="X0Response">

                <xs:sequence>

                	<xs:element name="oK" type="OK"/>

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <!-- See Annex B -->

<!-- See section 6.2.6.2 ADDED END-->   





<!-- See Annex C.2 -->

    <xs:complexType name="CMPEnrolmentDetails">

        <xs:sequence>

            <xs:element name="listOfCMPServerDetails" type="ListOfCMPServerDetails" minOccurs="1" maxOccurs="unbounded"/>

            <xs:element name="cMPCertsOnlineEnrolment" type="CMPCertsOnlineEnrolment" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="ListOfCMPServerDetails">

        <xs:sequence>

            <xs:element name="serverName" type="xs:string"/>

            <xs:element name="certificateAuthority" type="xs:string"/>

            <xs:element name="uRL" type="xs:string"/>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="CMPCertsOnlineEnrolment">

        <xs:sequence>

            <xs:element name="keyName" type="xs:string"/>

            <xs:element name="certificateName" type="xs:string"/>

            <xs:element name="algoritm" type="Algorithm"/>

            <xs:element name="KeyIdentifier" type="xs:string"/>

            <xs:element name="Password" type="xs:string"/>

            <xs:element name="Subject" type="xs:string"/>

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

            <xs:element name="RenewalThreshold" type="xs:integer"/>

        </xs:sequence>

    </xs:complexType>



    <xs:simpleType name="Algorithm">

		<xs:restriction base="xs:string">

			<xs:enumeration value="rsa2048"/>

			<xs:enumeration value="rsa3072"/>

            <xs:enumeration value="rsa4096"/>

            <xs:enumeration value="secp256r1"/>

            <xs:enumeration value="secp384r1 "/>

            <xs:enumeration value="secp521r1"/>

		</xs:restriction>

	</xs:simpleType>



    <xs:complexType name="ACMEEnrolmentDetails">

        <xs:sequence>

        </xs:sequence>