From 2583de18cdce991ba619fd23c2777a3e742ba086 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 10 Dec 2015 11:52:41 +0000
Subject: [PATCH] Retire the EncryptionMethod fixup from the fallback and WAYF
 aggregates.

---
 mdx/uk/generate.xml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/mdx/uk/generate.xml b/mdx/uk/generate.xml
index f9205c1c..adca4c19 100644
--- a/mdx/uk/generate.xml
+++ b/mdx/uk/generate.xml
@@ -96,20 +96,6 @@
         software they to cater for is retired.
     -->
     
-    <!--
-        fixup_EncryptionMethod
-        
-        Remove all md:EncryptionMethod elements.
-        
-        This is normally done to avoid triggering a problem in OpenSAML-C 2.0.
-        
-        See https://wiki.shibboleth.net/confluence/display/SHIB2/MetadataCorrectness#MetadataCorrectness-Version20
-    -->
-    <bean id="fixup_EncryptionMethod" parent="ElementStrippingStage"
-        p:id="fixup_EncryptionMethod"
-        p:elementName="EncryptionMethod"
-        p:elementNamespace="urn:oasis:names:tc:SAML:2.0:metadata"/>
-    
     <!--
         fixup_keyuse
         
@@ -142,18 +128,6 @@
         </property>
     </bean>
     
-    <!--
-        check_fixup_encmethod
-    -->
-    <bean id="check_fixup_encmethod" parent="XSLValidationStage"
-        p:id="check_fixup_encmethod">
-        <property name="XSLResource">
-            <bean parent="FileSystemResource">
-                <constructor-arg value="${basedir}/mdx/uk/check_fixup_encmethod.xsl"/>
-            </bean>
-        </property>
-    </bean>
-    
     <!--
         check_fixup_keyuse
     -->
@@ -390,14 +364,12 @@
                 <ref bean="stripEmptyExtensions"/>
                 
                 <ref bean="stripMdattrNamespace"/>
-                <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="uk_finaliseProduction"/>
                 <ref bean="uk_normaliseNamespaces"/>
 
                 <!-- WAYF aggregate MUST pass publishability test -->
                 <ref bean="checkPublishable"/>
-                <ref bean="check_fixup_encmethod"/>
                 <ref bean="errorTerminatingFilter"/>
 
                 <ref bean="serializeUnsignedWayfAggregate"/>
@@ -580,7 +552,6 @@
                 
                 <ref bean="uk_assemble"/>
                 <ref bean="stripWayfNamespace"/>
-                <ref bean="fixup_EncryptionMethod"/>
                 <ref bean="performOtherFixups"/>
                 <ref bean="stripEmptyExtensions"/>
                 <ref bean="uk_finaliseFallback"/>
@@ -588,7 +559,6 @@
                 
                 <!-- fallback aggregate MUST pass publishability test -->
                 <ref bean="checkPublishable"/>
-                <ref bean="check_fixup_encmethod"/>
                 <ref bean="errorTerminatingFilter"/>
                 
                 <ref bean="serializeUnsignedFallbackAggregate"/>