summaryrefslogtreecommitdiffstats
path: root/schemas/sslca-cert.xsd
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-03 17:08:02 -0600
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-12-03 19:51:05 -0600
commit5336c981b167858c3bb08b1ac4d94a700fd407a9 (patch)
tree81f6e0aa1fbdf42167d423cd878e832dc5d76f56 /schemas/sslca-cert.xsd
parent350db854319af526818c2ffcac285ae445b0213d (diff)
downloadbcfg2-5336c981b167858c3bb08b1ac4d94a700fd407a9.tar.gz
bcfg2-5336c981b167858c3bb08b1ac4d94a700fd407a9.tar.bz2
bcfg2-5336c981b167858c3bb08b1ac4d94a700fd407a9.zip
SSLCA improvements:
Added support for Group/Client tags in cert.xml/key.xml Added support for explicit subjectAltNames in cert.xml Reorganized code to make generally more like other GroupSpool plugins
Diffstat (limited to 'schemas/sslca-cert.xsd')
-rw-r--r--schemas/sslca-cert.xsd22
1 files changed, 2 insertions, 20 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>