summaryrefslogtreecommitdiffstats
path: root/schemas/sslca-key.xsd
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-07 08:26:39 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-07 08:26:39 -0500
commit7db65d41386768a5081c34c16db17e82b96a5b7a (patch)
tree07ff91016b461afb44ced8247bafcba2d1f21ae2 /schemas/sslca-key.xsd
parent65caf3f586d7985d88652c73e7b214ba3e40eac2 (diff)
downloadbcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.gz
bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.tar.bz2
bcfg2-7db65d41386768a5081c34c16db17e82b96a5b7a.zip
made XInlcude and Encryption support more consistent
Diffstat (limited to 'schemas/sslca-key.xsd')
-rw-r--r--schemas/sslca-key.xsd22
1 files changed, 12 insertions, 10 deletions
diff --git a/schemas/sslca-key.xsd b/schemas/sslca-key.xsd
index 021da275c..2b6a02b98 100644
--- a/schemas/sslca-key.xsd
+++ b/schemas/sslca-key.xsd
@@ -25,6 +25,7 @@
<xsd:element name="Key" type="KeyType"/>
<xsd:element name="Group" type="SSLCAKeyGroupType"/>
<xsd:element name="Client" type="SSLCAKeyGroupType"/>
+ <xsd:element name="KeyInfo" type="KeyInfoType"/>
</xsd:choice>
<xsd:attribute name='name' type='xsd:string'>
<xsd:annotation>
@@ -77,19 +78,20 @@
<xsd:attributeGroup ref="py:genshiAttrs"/>
</xsd:complexType>
- <xsd:element name="KeyInfo">
+ <xsd:complexType name="KeyInfoType">
<xsd:annotation>
<xsd:documentation>
Top-level tag for describing an SSLCA generated key.
</xsd:documentation>
</xsd:annotation>
- <xsd:complexType>
- <xsd:choice minOccurs="1" maxOccurs="unbounded">
- <xsd:group ref="py:genshiElements"/>
- <xsd:element name="Key" type="KeyType"/>
- <xsd:element name="Group" type="SSLCAKeyGroupType"/>
- <xsd:element name="Client" type="SSLCAKeyGroupType"/>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
+ <xsd:choice minOccurs="1" maxOccurs="unbounded">
+ <xsd:group ref="py:genshiElements"/>
+ <xsd:element name="Key" type="KeyType"/>
+ <xsd:element name="Group" type="SSLCAKeyGroupType"/>
+ <xsd:element name="Client" type="SSLCAKeyGroupType"/>
+ <xsd:element name="KeyInfo" type="KeyInfoType"/>
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:element name="KeyInfo" type="KeyInfoType"/>
</xsd:schema>