From 7db65d41386768a5081c34c16db17e82b96a5b7a Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 7 Feb 2013 08:26:39 -0500
Subject: made XInlcude and Encryption support more consistent

---
 schemas/sslca-cert.xsd | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'schemas/sslca-cert.xsd')

diff --git a/schemas/sslca-cert.xsd b/schemas/sslca-cert.xsd
index 99fb2be99..49d821aaf 100644
--- a/schemas/sslca-cert.xsd
+++ b/schemas/sslca-cert.xsd
@@ -26,6 +26,7 @@
       <xsd:element name="Group" type="SSLCACertGroupType"/>
       <xsd:element name="Client" type="SSLCACertGroupType"/>
       <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
+      <xsd:element name="CertInfo" type="CertInfoType"/>
     </xsd:choice>
     <xsd:attribute name='name' type='xsd:string'>
       <xsd:annotation>
@@ -156,20 +157,21 @@
     <xsd:attributeGroup ref="py:genshiAttrs"/>
   </xsd:complexType>
 
-  <xsd:element name="CertInfo">
+  <xsd:complexType name="CertInfoType">
     <xsd:annotation>
       <xsd:documentation>
         Top-level tag for describing an SSLCA generated certificate.
       </xsd:documentation>
     </xsd:annotation>
-    <xsd:complexType>
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-        <xsd:group ref="py:genshiElements"/>
-        <xsd:element name="Cert" type="CertType"/>
-        <xsd:element name="Group" type="SSLCACertGroupType"/>
-        <xsd:element name="Client" type="SSLCACertGroupType"/>
-        <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
-      </xsd:choice>
-    </xsd:complexType>
-  </xsd:element>
+    <xsd:choice minOccurs="1" maxOccurs="unbounded">
+      <xsd:group ref="py:genshiElements"/>
+      <xsd:element name="Cert" type="CertType"/>
+      <xsd:element name="Group" type="SSLCACertGroupType"/>
+      <xsd:element name="Client" type="SSLCACertGroupType"/>
+      <xsd:element name="subjectAltName" type="SubjectAltNameType"/>
+      <xsd:element name="CertInfo" type="CertInfoType"/>
+    </xsd:choice>
+  </xsd:complexType>
+
+  <xsd:element name="CertInfo" type="CertInfoType"/>
 </xsd:schema>
-- 
cgit v1.2.3-1-g7c22