diff options
Diffstat (limited to 'schemas')
-rw-r--r-- | schemas/sslca-cert.xsd | 22 | ||||
-rw-r--r-- | schemas/sslca-key.xsd | 6 |
2 files changed, 2 insertions, 26 deletions
diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd index 921c1c7c6..9e0d031a2 100644 --- a/schemas/sslca-cert.xsd +++ b/schemas/sslca-cert.xsd @@ -6,42 +6,24 @@ </xsd:documentation> </xsd:annotation> - <!-- cert.xml does not support Group or Client tags, but it should - (and will, some day), so this is commented out for now --> - <!-- <xsd:complexType name="GroupType"> <xsd:choice minOccurs="1" maxOccurs="unbounded"> <xsd:element name="Cert" type="CertType"/> <xsd:element name="Group" type="GroupType"/> <xsd:element name="Client" type="GroupType"/> + <xsd:element name="subjectAltName" type="xsd:string"/> </xsd:choice> <xsd:attribute type="xsd:string" name="name" use="required"/> <xsd:attribute type="xsd:string" name="negate"/> </xsd:complexType> - --> - - <xsd:complexType name="CertType"> - <xsd:attribute type="xsd:string" name="key" use="required"/> - <xsd:attribute type="xsd:string" name="format"/> - <xsd:attribute type="xsd:string" name="ca"/> - <xsd:attribute type="xsd:integer" name="days"/> - <xsd:attribute type="xsd:string" name="c"/> - <xsd:attribute type="xsd:string" name="l"/> - <xsd:attribute type="xsd:string" name="st"/> - <xsd:attribute type="xsd:string" name="ou"/> - <xsd:attribute type="xsd:string" name="o"/> - <xsd:attribute type="xsd:string" name="emailaddress"/> - <xsd:attribute type="xsd:string" name="append_chain"/> - </xsd:complexType> <xsd:element name="CertInfo"> <xsd:complexType> <xsd:choice minOccurs="1" maxOccurs="unbounded"> <xsd:element name="Cert" type="CertType"/> - <!-- <xsd:element name="Group" type="GroupType"/> <xsd:element name="Client" type="GroupType"/> - --> + <xsd:element name="subjectAltName" type="xsd:string"/> </xsd:choice> </xsd:complexType> </xsd:element> diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd index 2c931fa7d..e807ea037 100644 --- a/schemas/sslca-key.xsd +++ b/schemas/sslca-key.xsd @@ -6,9 +6,6 @@ </xsd:documentation> </xsd:annotation> - <!-- key.xml does not support Group or Client tags, but it should - (and will, some day), so this is commented out for now --> - <!-- <xsd:complexType name="GroupType"> <xsd:choice minOccurs="1" maxOccurs="unbounded"> <xsd:element name="Key" type="KeyType"/> @@ -18,7 +15,6 @@ <xsd:attribute type="xsd:string" name="name" use="required"/> <xsd:attribute type="xsd:string" name="negate"/> </xsd:complexType> - --> <xsd:complexType name="KeyType"> <xsd:attribute type="xsd:string" name="type"/> @@ -29,10 +25,8 @@ <xsd:complexType> <xsd:choice minOccurs="1" maxOccurs="unbounded"> <xsd:element name="Key" type="KeyType"/> - <!-- <xsd:element name="Group" type="GroupType"/> <xsd:element name="Client" type="GroupType"/> - --> </xsd:choice> </xsd:complexType> </xsd:element> |