From 2a889b44733933b362d98fbd89c466998d0afc04 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Tue, 14 Mar 2017 11:14:12 +0000
Subject: [PATCH] Normalise xenc namespace without prefix in fallback aggregate

See ukf/ukf-meta#110.
---
 mdx/uk/README.md        |  3 +--
 mdx/uk/ns_norm_back.xsl | 24 +++++++++++++++++++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index d0bd2d04..88b4703b 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -65,8 +65,7 @@ Status (2017-03-02):
 
 ### Fallback Aggregate vs. Production Aggregate
 
-Status (2017-03-10):
+Status (2017-03-14):
 
 * the production aggregate implements a _blacklisting_ approach to entity attributes imported from eduGAIN,
 while the production aggregate implements the traditional entity attribute _whitelist_. (2017-03-02)
-* The production aggregate normalises the `xenc` namespace to not use a prefix, as it is not very commonly used. (2017-02-13)
diff --git a/mdx/uk/ns_norm_back.xsl b/mdx/uk/ns_norm_back.xsl
index 64967aac..0d2402c2 100644
--- a/mdx/uk/ns_norm_back.xsl
+++ b/mdx/uk/ns_norm_back.xsl
@@ -38,8 +38,9 @@
 	xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
 	xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 	xmlns:wayf="http://sdss.ac.uk/2006/06/WAYF"
+	xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 	
-	exclude-result-prefixes="alg md wayf"
+	exclude-result-prefixes="alg md wayf xenc"
 	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">
@@ -113,5 +114,26 @@
 		</xsl:element>
 	</xsl:template>
 	
+
+	<!--
+        ***************************************
+        ***                                 ***
+        ***   X E N C   N A M E S P A C E   ***
+        ***                                 ***
+        ***************************************
+    -->
+
+
+	<!--
+        xenc:*
+        
+        Normalise namespace to not use a prefix.
+    -->
+	<xsl:template match="xenc:*">
+		<xsl:element name="{local-name()}" namespace="http://www.w3.org/2001/04/xmlenc#">
+			<xsl:apply-templates select="node()|@*"/>
+		</xsl:element>
+	</xsl:template>	
+	
 	
 </xsl:stylesheet>