From 7497bed0388b12d95e80cf44352dc7e92968d9d5 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Mon, 2 Apr 2012 09:06:49 +0000
Subject: [PATCH] Promote check for SAML 2.0 SPs without KeyDescriptor usable
 for encryption to production.

---
 build/check_saml2.xsl  | 16 +++++++++++++++-
 mdx/check_future_0.xsl | 13 -------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/build/check_saml2.xsl b/build/check_saml2.xsl
index c4f8dbf5..d4d38b8f 100644
--- a/build/check_saml2.xsl
+++ b/build/check_saml2.xsl
@@ -9,9 +9,10 @@
 
 -->
 <xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
 	xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
 
 	<!--
@@ -54,4 +55,17 @@
 		</xsl:call-template>
 	</xsl:template>
 
+
+	<!--
+        Check for SAML 2.0 SPs which lack an encryption key.
+    -->	
+	<xsl:template match="md:SPSSODescriptor
+		[contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
+		[not(md:KeyDescriptor[descendant::ds:X509Data][@use='encryption'])]
+		[not(md:KeyDescriptor[descendant::ds:X509Data][not(@use)])]">
+		<xsl:call-template name="error">
+			<xsl:with-param name="m">SAML 2.0 SP has no encryption key</xsl:with-param>
+		</xsl:call-template>
+	</xsl:template>
+	
 </xsl:stylesheet>
diff --git a/mdx/check_future_0.xsl b/mdx/check_future_0.xsl
index d28ab49b..e2732140 100644
--- a/mdx/check_future_0.xsl
+++ b/mdx/check_future_0.xsl
@@ -30,17 +30,4 @@
 	<xsl:import href="../build/check_framework.xsl"/>
 
 	
-	<!--
-		Check for SAML 2.0 SPs which lack an encryption key.
-	-->
-	
-	<xsl:template match="md:SPSSODescriptor
-		[contains(@protocolSupportEnumeration, 'urn:oasis:names:tc:SAML:2.0:protocol')]
-		[not(md:KeyDescriptor[descendant::ds:X509Data][@use='encryption'])]
-		[not(md:KeyDescriptor[descendant::ds:X509Data][not(@use)])]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">SAML 2 SP has no encryption key</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
 </xsl:stylesheet>