From aa82f6cc8d2edf9a9c10a5ba3e36a72b99709e3f Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 14 Apr 2021 11:42:02 +0100
Subject: [PATCH] Hoist "alg" namespace in production aggregates

Phase two of ukf/ukf-meta#98.
---
 mdx/uk/README.md          | 15 +++++++--------
 mdx/uk/ns_norm_cds.xsl    |  2 +-
 mdx/uk/ns_norm_export.xsl | 23 +----------------------
 mdx/uk/ns_norm_uk.xsl     | 23 +----------------------
 4 files changed, 10 insertions(+), 53 deletions(-)

diff --git a/mdx/uk/README.md b/mdx/uk/README.md
index b43c688f..da8ed8df 100644
--- a/mdx/uk/README.md
+++ b/mdx/uk/README.md
@@ -28,10 +28,9 @@ before being included in the `export` version consumed by interfederation partne
 
 ### Export Preview Aggregate vs. Export Aggregate
 
-Status (2021-02-23):
+Status (2021-04-14):
 
-* The `export-preview` aggregate declares the `alg` namespace on the document element,
-  rather than on each `<DigestMethod>` or `<SigningMethod>` element.
+* These aggregates are currently identical.
 
 ## Production Maturity Pipeline
 
@@ -60,16 +59,13 @@ when it appeared in the fallback aggregate, which would be too late to take corr
 
 ### Test Aggregate vs. Production Aggregate
 
-Status (2021-02-23):
+Status (2021-04-14):
 
 * The `test` aggregate does not include the `<UKFederationMember>` label (`ukf-meta#34`).
 
 * The `test` aggregate does not include the entity-level copy of the scopes for an
   identity provider (`ukf-meta#49`).
 
-* The `test` aggregate declares the `alg` namespace on the document element,
-  rather than on each `<DigestMethod>` or `<SigningMethod>` element.
-
 ### `cds-all` Aggregate vs. Production Aggregate
 
 Status (2017-12-05):
@@ -80,7 +76,10 @@ Status (2017-12-05):
 
 ### Fallback Aggregate vs. Production Aggregate
 
-Status (2021-02-23):
+Status (2021-04-14):
 
 * The `production` aggregate adds `<EncryptionMethod>` elements with AES128-CBC
   to SPs that have no block encryption methods listed
+
+* The `production` aggregate declares the `alg` namespace on the document element,
+  rather than on each `<DigestMethod>` or `<SigningMethod>` element.
diff --git a/mdx/uk/ns_norm_cds.xsl b/mdx/uk/ns_norm_cds.xsl
index 2d3dcfb2..218a8949 100644
--- a/mdx/uk/ns_norm_cds.xsl
+++ b/mdx/uk/ns_norm_cds.xsl
@@ -21,7 +21,7 @@
     xmlns:shibmd="urn:mace:shibboleth:metadata:1.0"
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
 
-    exclude-result-prefixes="alg ds init md mdattr saml shibmd ukfedlabel xsi"
+    exclude-result-prefixes="ds init md mdattr saml shibmd ukfedlabel xsi"
     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">
diff --git a/mdx/uk/ns_norm_export.xsl b/mdx/uk/ns_norm_export.xsl
index 96c454f4..9225b2ed 100644
--- a/mdx/uk/ns_norm_export.xsl
+++ b/mdx/uk/ns_norm_export.xsl
@@ -33,7 +33,7 @@
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 
-    exclude-result-prefixes="alg md ukfedlabel xenc"
+    exclude-result-prefixes="md ukfedlabel 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">
@@ -87,27 +87,6 @@
     </xsl:template>
 
 
-    <!--
-        *************************************
-        ***                               ***
-        ***   A L G   N A M E S P A C E   ***
-        ***                               ***
-        *************************************
-    -->
-
-
-    <!--
-        alg:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="alg:*">
-        <xsl:element name="{local-name()}" namespace="urn:oasis:names:tc:SAML:metadata:algsupport">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
     <!--
         ***************************************
         ***                                 ***
diff --git a/mdx/uk/ns_norm_uk.xsl b/mdx/uk/ns_norm_uk.xsl
index fa5ebdc5..b4100d47 100644
--- a/mdx/uk/ns_norm_uk.xsl
+++ b/mdx/uk/ns_norm_uk.xsl
@@ -39,7 +39,7 @@
     xmlns:ukfedlabel="http://ukfederation.org.uk/2006/11/label"
     xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
 
-    exclude-result-prefixes="alg md xenc"
+    exclude-result-prefixes="md 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">
@@ -93,27 +93,6 @@
     </xsl:template>
 
 
-    <!--
-        *************************************
-        ***                               ***
-        ***   A L G   N A M E S P A C E   ***
-        ***                               ***
-        *************************************
-    -->
-
-
-    <!--
-        alg:*
-
-        Normalise namespace to not use a prefix.
-    -->
-    <xsl:template match="alg:*">
-        <xsl:element name="{local-name()}" namespace="urn:oasis:names:tc:SAML:metadata:algsupport">
-            <xsl:apply-templates select="node()|@*"/>
-        </xsl:element>
-    </xsl:template>
-
-
     <!--
         ***************************************
         ***                                 ***