Commit 7352b770 authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Updating algo definition and examples

parent 8baca4c5

104000/examples/01_registration_response.xml

+4 −1
Original line number Diff line number Diff line
@@ -22,7 +22,10 @@ 
                        </cMPServer>

                    </cMPServerDetails>

                    <cMPCertificateOnlineEnrolment>

                        <algorithm>rsa2048</algorithm>

                        <algorithm>

                            <algorithmOID>1.2.840.113549.1.1.1</algorithmOID>

                            <algorithmBitSize>2048</algorithmBitSize>

                        </algorithm>

                        <keyIdentifier>key_identifier</keyIdentifier>

                        <password>password</password>

                        <subject>subject</subject>

104000/examples/02_xn_cert_enrolment_response.xml

+8 −2
Original line number Diff line number Diff line
@@ -21,7 +21,10 @@ 
                        </cMPServer>

                    </cMPServerDetails>

                    <cMPCertificateOnlineEnrolment>

                        <algorithm>rsa2048</algorithm>

                        <algorithm>

                            <algorithmOID>1.2.840.113549.1.1.1</algorithmOID>

                            <algorithmBitSize>2048</algorithmBitSize>

                        </algorithm>

                        <keyIdentifier>key_identifier</keyIdentifier>

                        <password>password</password>

                        <subject>subject</subject>
@@ -47,7 +50,10 @@ 
                        </cMPServer>

                    </cMPServerDetails>

                    <cMPCertificateOnlineEnrolment>

                        <algorithm>rsa2048</algorithm>

                        <algorithm>

                            <algorithmOID>1.2.840.10045.2.1</algorithmOID>

                            <curveOID>1.2.840.10045.3.1.7</curveOID>

                        </algorithm>

                        <keyIdentifier>key_identifier</keyIdentifier>

                        <password>password</password>

                        <subject>subject</subject>

104000/schema/TS_104_000.xsd

+10 −8
Original line number Diff line number Diff line
@@ -251,14 +251,16 @@ 
            <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:complexType name="Algorithm">

        <xs:sequence>

            <xs:element name="algorithmOID" type="OIDValue"/>

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

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

        </xs:sequence>

    </xs:complexType>

    <xs:simpleType name="OIDValue">

        <xs:restriction base="etsi103280:ShortString">

            <xs:pattern value="([0-9]+\.)+[0-9]+"/>

        </xs:restriction>

    </xs:simpleType>

</xs:schema>