From f1769c45b1e31e374e4345fd4bbdc3585be96f24 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 7 Nov 2013 15:25:13 +0000
Subject: [PATCH] Remove long-unused test for IdPs with no KeyName.

---
 mdx/_rules/check_nokeyname.xsl | 51 ----------------------------------
 mdx/validation-beans.xml       | 12 --------
 2 files changed, 63 deletions(-)
 delete mode 100644 mdx/_rules/check_nokeyname.xsl

diff --git a/mdx/_rules/check_nokeyname.xsl b/mdx/_rules/check_nokeyname.xsl
deleted file mode 100644
index f0d62b53..00000000
--- a/mdx/_rules/check_nokeyname.xsl
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-	check_nokeyname.xsl
-	
-	Checking ruleset for IdPs which have no KeyName; this indicates an IdP which can't interoperate
-	with certain versions of OpenAthens SP.
-
-	Author: Ian A. Young <ian@iay.org.uk>
-
--->
-<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:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
-	xmlns:set="http://exslt.org/sets"
-	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol"
-
-	xmlns:mdxURL="xalan://uk.ac.sdss.xalan.md.URLchecker"
-
-	xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-
-	<!--
-		Common support functions.
-	-->
-	<xsl:import href="check_framework.xsl"/>
-
-	
-	<xsl:template match="md:EntityDescriptor[md:IDPSSODescriptor][not(descendant::ds:KeyName)]">
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:if test="descendant::md:Extensions/wayf:HideFromWAYF">
-					<xsl:text>(hidden) </xsl:text>
-				</xsl:if>
-				<xsl:text>identity provider lacks PKIX validatable credential</xsl:text>
-			</xsl:with-param>
-		</xsl:call-template>
-		<xsl:call-template name="error">
-			<xsl:with-param name="m">
-				<xsl:value-of select="descendant::md:OrganizationDisplayName"/>
-				<xsl:text>: </xsl:text>
-				<xsl:value-of select="@entityID"/>
-			</xsl:with-param>
-		</xsl:call-template>
-	</xsl:template>
-	
-</xsl:stylesheet>
diff --git a/mdx/validation-beans.xml b/mdx/validation-beans.xml
index 4bc41403..1c06cdf9 100644
--- a/mdx/validation-beans.xml
+++ b/mdx/validation-beans.xml
@@ -484,18 +484,6 @@
         </property>
     </bean>
     
-    <!--
-        check_nokeyname
-    -->
-    <bean id="check_nokeyname" parent="XSLValidationStage"
-        p:id="check_nokeyname">
-        <property name="XSLResource">
-            <bean parent="FilesystemResource">
-                <constructor-arg value="#{ systemProperties['rulesdir'] }/check_nokeyname.xsl"/>
-            </bean>
-        </property>
-    </bean>
-    
     <!--
         check_regscope