Add LC dsig11 schema, fix SerialNumber type in original.

diff --git a/cpp-xmltooling.sln b/cpp-xmltooling.sln
index e9aba49..eb037bb 100644 (file)
--- a/cpp-xmltooling.sln
+++ b/cpp-xmltooling.sln
@@ -30,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Schemas", "Schemas", "{23EF
                schemas\xenc-schema.xsd = schemas\xenc-schema.xsd\r
                schemas\xml.xsd = schemas\xml.xsd\r
                schemas\xmldsig-core-schema.xsd = schemas\xmldsig-core-schema.xsd\r
+               schemas\xmldsig11-schema.xsd = schemas\xmldsig11-schema.xsd\r
                schemas\xmltooling.xsd = schemas\xmltooling.xsd\r
        EndProjectSection\r
 EndProject\r

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 93a5b69..46bedc0 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,13 +1,12 @@
-## $Id:$ 
-
 AUTOMAKE_OPTIONS = foreign
 
 schemafiles = \
        soap-envelope.xsd \
        xenc-schema.xsd \
-        xmldsig-core-schema.xsd \
-        xml.xsd \
-        xmltooling.xsd
+       xmldsig-core-schema.xsd \
+       xmldsig11-schema.xsd \
+       xml.xsd \
+       xmltooling.xsd
 
 pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
 

diff --git a/schemas/catalog.xml.in b/schemas/catalog.xml.in
index 3f57ae0..0c230cb 100644 (file)
--- a/schemas/catalog.xml.in
+++ b/schemas/catalog.xml.in
@@ -3,6 +3,7 @@
     <system systemId="http://www.w3.org/XML/1998/namespace" uri="@-PKGXMLDIR-@/xml.xsd"/>
     <system systemId="http://www.w3.org/2001/04/xmlenc#" uri="@-PKGXMLDIR-@/xenc-schema.xsd"/>
     <system systemId="http://www.w3.org/2000/09/xmldsig#" uri="@-PKGXMLDIR-@/xmldsig-core-schema.xsd"/>
+    <system systemId="http://www.w3.org/2009/xmldsig11#" uri="@-PKGXMLDIR-@/xmldsig11-schema.xsd"/>
     <system systemId="http://www.opensaml.org/xmltooling" uri="@-PKGXMLDIR-@/xmltooling.xsd"/>
     <system systemId="http://schemas.xmlsoap.org/soap/envelope/" uri="@-PKGXMLDIR-@/soap-envelope.xsd"/>
 </catalog>

diff --git a/schemas/xmldsig-core-schema.xsd b/schemas/xmldsig-core-schema.xsd
index a1d4708..cd98aa3 100644 (file)
--- a/schemas/xmldsig-core-schema.xsd
+++ b/schemas/xmldsig-core-schema.xsd
@@ -188,7 +188,7 @@
 <complexType name="X509IssuerSerialType"> 
   <sequence> 
     <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
+    <element name="X509SerialNumber" type="string"/> 
   </sequence>
 </complexType>
 

diff --git a/schemas/xmldsig11-schema.xsd b/schemas/xmldsig11-schema.xsd
new file mode 100644 (file)
index 0000000..56c82be
--- /dev/null
+++ b/schemas/xmldsig11-schema.xsd
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        xmlns:dsig11="http://www.w3.org/2009/xmldsig11#"
+        targetNamespace="http://www.w3.org/2009/xmldsig11#"
+        version="0.1" elementFormDefault="qualified">
+
+  <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+
+  <element name="ECKeyValue" type="dsig11:ECKeyValueType"/>
+  <complexType name="ECKeyValueType">
+    <sequence>
+      <choice>
+        <element name="ECParameters" type="dsig11:ECParametersType"/>
+        <element name="NamedCurve" type="dsig11:NamedCurveType"/>
+      </choice>
+      <element name="PublicKey" type="dsig11:ECPointType"/>
+    </sequence>
+    <attribute name="Id" type="ID" use="optional"/>
+  </complexType>
+
+  <complexType name="NamedCurveType">
+    <attribute name="URI" type="anyURI" use="required"/>
+  </complexType>
+  
+  <simpleType name="ECPointType">
+    <restriction base="ds:CryptoBinary"/>
+  </simpleType>
+
+  <complexType name="ECParametersType">
+    <sequence>
+      <element name="FieldID" type="dsig11:FieldIDType"/>
+      <element name="Curve" type="dsig11:CurveType"/>
+      <element name="Base" type="dsig11:ECPointType"/>
+      <element name="Order" type="ds:CryptoBinary"/>
+      <element name="CoFactor" type="integer" minOccurs="0"/>
+      <element name="ValidationData"
+               type="dsig11:ECValidationDataType" minOccurs="0"/>
+    </sequence>
+  </complexType>
+  
+  <complexType name="FieldIDType">
+    <choice>
+      <element ref="dsig11:Prime"/>
+      <element ref="dsig11:TnB"/>
+      <element ref="dsig11:PnB"/>
+      <element ref="dsig11:GnB"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </complexType>
+
+  <complexType name="CurveType">
+    <sequence>
+      <element name="A" type="ds:CryptoBinary"/>
+      <element name="B" type="ds:CryptoBinary"/>
+    </sequence>
+  </complexType>
+
+  <complexType name="ECValidationDataType">
+    <sequence>
+      <element name="seed" type="ds:CryptoBinary"/>
+    </sequence>
+    <attribute name="hashAlgorithm" type="anyURI" use="required"/>
+  </complexType>
+
+  <element name="Prime" type="dsig11:PrimeFieldParamsType"/>
+  <complexType name="PrimeFieldParamsType">
+    <sequence>
+      <element name="P" type="ds:CryptoBinary"/>
+    </sequence>
+  </complexType>
+
+  <element name="GnB" type="dsig11:CharTwoFieldParamsType"/>
+  <complexType name="CharTwoFieldParamsType">
+    <sequence>
+      <element name="M" type="positiveInteger"/>
+    </sequence>
+  </complexType>
+  
+  <element name="TnB" type="dsig11:TnBFieldParamsType"/>
+  <complexType name="TnBFieldParamsType">
+    <complexContent>
+      <extension base="dsig11:CharTwoFieldParamsType">
+        <sequence>
+          <element name="K" type="positiveInteger"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <element name="PnB" type="dsig11:PnBFieldParamsType"/>
+  <complexType name="PnBFieldParamsType">
+    <complexContent>
+      <extension base="dsig11:CharTwoFieldParamsType">
+        <sequence>
+          <element name="K1" type="positiveInteger"/>
+          <element name="K2" type="positiveInteger"/>
+          <element name="K3" type="positiveInteger"/>
+        </sequence>
+      </extension>
+    </complexContent>
+  </complexType>
+
+  <element name="OCSPResponse" type="base64Binary"/>
+
+  <element name="DEREncodedKeyValue" type="dsig11:DEREncodedKeyValueType"/>
+  <complexType name="DEREncodedKeyValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+  <element name="KeyInfoReference" type="dsig11:KeyInfoReferenceType"/> 
+  <complexType name="KeyInfoReferenceType">
+    <attribute name="URI" type="anyURI" use="required"/>
+    <attribute name="Id" type="ID" use="optional"/>
+  </complexType>
+
+</schema>
+