From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Wed, 19 May 2010 18:43:07 +0000 (+0000)
Subject: Add signature element to external config elements.
X-Git-Tag: 2.4~82
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=5966d880344b487220d99302fc0a804ef40cf1f6

Add signature element to external config elements.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3257 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/schemas/shibboleth-2.0-attribute-map.xsd b/schemas/shibboleth-2.0-attribute-map.xsd
index 4fa9883..17b90cc 100644
--- a/schemas/shibboleth-2.0-attribute-map.xsd
+++ b/schemas/shibboleth-2.0-attribute-map.xsd
@@ -2,9 +2,12 @@
 <schema targetNamespace="urn:mace:shibboleth:2.0:attribute-map"
         xmlns="http://www.w3.org/2001/XMLSchema"
         xmlns:am="urn:mace:shibboleth:2.0:attribute-map"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
         elementFormDefault="qualified"
         version="2.3">
 
+    <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd" />
+
     <annotation>
         <documentation>
             This schema maps SAML attributes into Shibboleth internal attributes.
@@ -45,6 +48,7 @@
                 <element name="TrustEngine" type="am:PluggableType" minOccurs="0"/>
                 <element name="AttributeFilter" type="am:PluggableType" minOccurs="0"/>
                 <element name="Attribute" type="am:AttributeType" maxOccurs="unbounded"/>
+                <element ref="ds:Signature" minOccurs="0"/>
             </sequence>
             <attribute name="metadataPolicyId" type="am:string"/>
         </complexType>
diff --git a/schemas/shibboleth-2.0-native-sp-config.xsd b/schemas/shibboleth-2.0-native-sp-config.xsd
index 5d69ba6..02a4140 100644
--- a/schemas/shibboleth-2.0-native-sp-config.xsd
+++ b/schemas/shibboleth-2.0-native-sp-config.xsd
@@ -2,6 +2,7 @@
 <schema targetNamespace="urn:mace:shibboleth:2.0:native:sp:config"
 	xmlns="http://www.w3.org/2001/XMLSchema"
 	xmlns:conf="urn:mace:shibboleth:2.0:native:sp:config"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
 	xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
@@ -10,6 +11,7 @@
 	blockDefault="substitution"
 	version="2.4">
 
+  <import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd" />
   <import namespace="urn:oasis:names:tc:SAML:2.0:assertion" schemaLocation="saml-schema-assertion-2.0.xsd"/>
   <import namespace="urn:oasis:names:tc:SAML:2.0:protocol" schemaLocation="saml-schema-protocol-2.0.xsd"/>
   <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="saml-schema-metadata-2.0.xsd"/>
@@ -260,6 +262,7 @@
           <element name="Host" type="conf:HostType"/>
           <element name="HostRegex" type="conf:HostRegexType"/>
         </choice>
+        <element ref="ds:Signature" minOccurs="0"/>
       </sequence>
       <attribute name="applicationId" type="conf:string" fixed="default"/>
       <attributeGroup ref="conf:ContentSettings"/>
@@ -675,6 +678,7 @@
         <element name="ApplicationDefaults" type="conf:ApplicationDefaultsType"/>
         <element name="SecurityPolicies" type="conf:SecurityPoliciesType"/>
         <element ref="conf:TransportOption" minOccurs="0" maxOccurs="unbounded"/>
+        <element ref="ds:Signature" minOccurs="0"/>
       </sequence>
       <attribute name="logger" type="anyURI"/>
       <attribute name="clockSkew" type="unsignedInt"/>