From 5336c981b167858c3bb08b1ac4d94a700fd407a9 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 3 Dec 2012 17:08:02 -0600
Subject: 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

---
 schemas/sslca-cert.xsd | 22 ++--------------------
 schemas/sslca-key.xsd  |  6 ------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'schemas')

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>
-- 
cgit v1.2.3-1-g7c22