From 148f7927b138bd051d8593fe0e5a347547f49e96 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 11 May 2011 09:07:39 +0000
Subject: [PATCH] Do not patch @use-less KeyDescriptors destined for the export
 aggregate, so that exported metadata is as close to registered metadata as
 possible. Do not check the export aggregate against the "publishable"
 rulesets, which now only apply to UK federation publication.

---
 build.xml                  |  5 +++--
 build/uk_master_export.xsl | 12 ------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index 7235eee4..22584481 100644
--- a/build.xml
+++ b/build.xml
@@ -417,7 +417,9 @@
 	
     <!--
         Check a metadata document for publishability.  This is applied during all
-        publication flows prior to any signature step.
+        UK publication flows prior to any signature step.  It is not applied to
+        export flows, for which we desire the closest possible correspondence to
+        the registered metadata.
         
         At the moment, this is a single test which is no longer being performed elsewhere
         but should pass by construction.  In the longer term it may make sense to
@@ -454,7 +456,6 @@
 		<XALAN x="uk_master_export.xsl" i="${uk.master.file}"
 			o="${md.export.unsigned}" />
 		<MDNORM i="${md.export.unsigned}"/>
-        <CHECK.publishable i="${xml.dir}/${md.export.unsigned}"/>
 		
 		<!-- [31] -->
 		<XALAN x="uk_master_back.xsl" i="${uk.master.file}"
diff --git a/build/uk_master_export.xsl b/build/uk_master_export.xsl
index 4a893f96..689f01a9 100644
--- a/build/uk_master_export.xsl
+++ b/build/uk_master_export.xsl
@@ -129,18 +129,6 @@
 		</xsl:if>
 	</xsl:template>
 	
-	<!--
-		Patch any @use-less KeyName descriptors in IdP roles
-		for the benefit of Shib SPs pre-1.3.1.
-	-->
-	<xsl:template match="md:IDPSSODescriptor/md:KeyDescriptor[not(@use)] |
-		md:AttributeAuthorityDescriptor/md:KeyDescriptor[not(@use)]">
-		<xsl:copy>
-			<xsl:attribute name="use">signing</xsl:attribute>
-			<xsl:apply-templates/>
-		</xsl:copy>
-	</xsl:template>
-	
 	<!--
 		Drop text nodes inside the document element.  There's one of these for each
 		EntityDescriptor in the original document, so without this most of the output