Commit 259adf9c authored by Biagio Maione's avatar Biagio Maione
Browse files

Replace ts_104000.xsd

parent c26aca87

104000/schema/ts_104000.xsd

+9 −63
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ 
            <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">
@@ -25,10 +23,7 @@ 
            <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">
@@ -45,7 +40,6 @@ 
    <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"/>
@@ -57,7 +51,6 @@ 
			<xs:enumeration value="ConfigurationResponse"/>

		</xs:restriction>

	</xs:simpleType>

    <!-- messageType added END -->

    <!-- See section 6.2.2 -->

    <xs:complexType name="ErrorResponse">

        <xs:complexContent>
@@ -75,7 +68,7 @@ 
            <xs:extension base="X0Request">

                <xs:sequence>

                    <xs:element name="supportedEnrolmentProtocols" type="ListOfSupportedEnrolmentProtocols"/>

                    <xs:element name="eliType" type="ELIType"/>

                    <xs:element name="eliType" type="etsi103280:ShortString"/>

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

                </xs:sequence>

            </xs:extension>
@@ -83,33 +76,22 @@ 
    </xs:complexType>

    <xs:complexType name="ListOfSupportedEnrolmentProtocols">

        <xs:sequence>

            <xs:element name="supportedEnrolmentProtocol" type="SupportedEnrolmentProtocol" maxOccurs="unbounded"/>

            <xs:element name="supportedEnrolmentProtocol" type="EnrolmentProtocolType" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="SupportedEnrolmentProtocol">

    <xs:simpleType name="EnrolmentProtocolType">

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

            <xs:enumeration value="CMP"/>

            <xs:enumeration value="ACME"/>

        </xs:restriction>

    </xs:simpleType>  

    <xs:simpleType name="ELIType">

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

            <xs:enumeration value="IRI-POI"/>

            <xs:enumeration value="CC-POI"/>

            <xs:enumeration value="IRI-TF"/>

            <xs:enumeration value="CC-TF"/>

            <xs:enumeration value="MDF"/>

        </xs:restriction>

    </xs:simpleType>

    <!-- See section 6.2.3.2 -->

    <xs:complexType name="RegistrationResponse">

        <xs:complexContent>

            <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="chosenEnrolmentProtocol" type="EnrolmentProtocolType"/>       

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

                </xs:sequence>

            </xs:extension>
@@ -189,7 +171,6 @@ 
            </xs:extension>

        </xs:complexContent>

    </xs:complexType>



    <xs:complexType name="ListOfConfigurationDetails">

        <xs:sequence>

            <xs:element name="configurationDetails" type="ConfigurationDetails" maxOccurs="unbounded"/>
@@ -201,23 +182,15 @@ 
            <xs:element name="definitionIdentifier" type="etsi103280:ShortString"/>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="X0ConfigurationDetails">

        <xs:complexContent>

            <xs:extension base="ConfigurationDetails">

                <xs:sequence>

 <!-- 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>



<!-- ImageKeyDetails added START -->

    <xs:complexType name="ImageKeyDetails">

        <xs:sequence>

            <xs:element name="iMKindentifier" type="etsi103280:UUID"/>
@@ -226,14 +199,12 @@ 
            <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"/>
@@ -241,36 +212,15 @@ 
            <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>

    </xs:complexType>

    <xs:complexType name="ADMFDetails">

        <xs:sequence>

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

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

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListOfDeliveryAddresses">

        <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-->   

<!-- See section 6.2.6.1 -->   

    <xs:complexType name="NotificationRequest"> 

        <xs:complexContent>

            <xs:extension base="X0Request">

                <xs:sequence>

                <xs:sequence/>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

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



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

<!-- See section 6.2.6.2 -->   

    <xs:complexType name="NotificationResponse">

        <xs:complexContent>

            <xs:extension base="X0Response">
@@ -280,8 +230,7 @@ 
            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

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



<!-- See section 6.2.6.2 -->   



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

    <xs:complexType name="CMPEnrolmentDetails">
@@ -298,7 +247,6 @@ 
            <xs:element name="uRL" type="xs:string"/>

        </xs:sequence>

    </xs:complexType>



    <xs:complexType name="CMPCertsOnlineEnrolment">

        <xs:sequence>

            <xs:element name="keyName" type="xs:string"/>
@@ -311,7 +259,6 @@ 
            <xs:element name="RenewalThreshold" type="xs:integer"/>

        </xs:sequence>

    </xs:complexType>



    <xs:simpleType name="Algorithm">

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

			<xs:enumeration value="rsa2048"/>
@@ -322,7 +269,6 @@ 
            <xs:enumeration value="secp521r1"/>

		</xs:restriction>

	</xs:simpleType>



    <xs:complexType name="ACMEEnrolmentDetails">

        <xs:sequence>

        </xs:sequence>