Commit 20cc278d authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Fixing multiplicity of enrolment details

parent dcc7e4a5

104000/examples/01_registration_response.xml

+30 −28
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
    <version>v1.1.1</version>

    <x0TransactionId>1664ca15-12ea-4f1f-8580-abf5885ae40a</x0TransactionId>

    <assignedELID>ELID_1234</assignedELID>

    <listOfCertificateEnrolmentDetails>

        <certificateEnrolmentDetails>

            <interfaceReference>LI_X1</interfaceReference>

            <certificateProtocolInterfaceType>
@@ -33,4 +34,5 @@ 
                </cMPEnrolmentDetails>

            </enrolmentProtocolDetails>

        </certificateEnrolmentDetails>

    </listOfCertificateEnrolmentDetails>

</X0Response>

104000/examples/02_xn_cert_enrolment_response.xml

+30 −28
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
    <messageTimestamp>2024-06-07T11:08:07.000000Z</messageTimestamp>

    <version>v1.1.1</version>

    <x0TransactionId>be165469-1024-4551-baab-84932e92abfb</x0TransactionId>

    <listOfCertificateEnrolmentDetails>

        <certificateEnrolmentDetails>

            <interfaceReference>LI_X1</interfaceReference>

            <certificateProtocolInterfaceType>
@@ -32,4 +33,5 @@ 
                </cMPEnrolmentDetails>

            </enrolmentProtocolDetails>

        </certificateEnrolmentDetails>

    </listOfCertificateEnrolmentDetails>

</X0Response>

104000/schema/TS_104_000.xsd

+10 −5
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
            <xs:extension base="X0Response">

                <xs:sequence>

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

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>
@@ -109,12 +109,17 @@ 
        <xs:complexContent>

            <xs:extension base="X0Response">

                <xs:sequence>

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

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

                </xs:sequence>

            </xs:extension>

        </xs:complexContent>

    </xs:complexType>

    <xs:complexType name="ListOfCertificateEnrolmentDetails">

        <xs:sequence>

            <xs:element name="certificateEnrolmentDetails"  type="CertificateEnrolmentDetails" minOccurs="1" maxOccurs="unbounded"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="CertificateEnrolmentDetails">

        <xs:sequence>

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

            <xs:element name="certificateProtocolInterfaceType" type="CertificateProfileInterfaceType"/>
@@ -215,7 +220,7 @@ 
    <xs:complexType name="CMPEnrolmentDetails">

        <xs:sequence>

            <xs:element name="cMPServerDetails" type="ListOfCMPServerDetails"/>

            <xs:element name="cMPCertificateOnlineEnrolments" type="ListoFCMPCertificateOnlineEnrolment"/>

            <xs:element name="cMPCertificateOnlineEnrolments" type="ListOfCMPCertificateOnlineEnrolment"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListOfCMPServerDetails">
@@ -230,7 +235,7 @@ 
            <xs:element name="uRL" type="xs:anyURI"/>

        </xs:sequence>

    </xs:complexType>

    <xs:complexType name="ListoFCMPCertificateOnlineEnrolment">

    <xs:complexType name="ListOfCMPCertificateOnlineEnrolment">

        <xs:sequence>

            <xs:element name="cMPCertificateOnlineEnrolment" type="CMPCertificateOnlineEnrolment" maxOccurs="unbounded"/>

        </xs:sequence>
@@ -238,7 +243,7 @@ 
    <xs:complexType name="CMPCertificateOnlineEnrolment">

        <xs:sequence>

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

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

            <xs:element name="keyIdentifier" type="xs:string" minOccurs="1"/>

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

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

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