From 22c95abe5b988fde4738cecea653f0b803c39570 Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Fri, 8 Apr 2011 15:16:52 +0000
Subject: [PATCH] New MDA snapshot; simplify import pipeline certificate
 handling as a result.

---
 feds/edugain/import.xml | 11 ++++-------
 feds/edugate/import.xml | 13 +++++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/feds/edugain/import.xml b/feds/edugain/import.xml
index 8b95c654..b7c72a77 100644
--- a/feds/edugain/import.xml
+++ b/feds/edugain/import.xml
@@ -22,20 +22,17 @@
     <!--
         eduGAIN signing certificate.
     -->
-    <bean id="edugainSigningCertificate" class="edu.vt.middleware.crypt.util.CryptReader"
-        factory-method="readCertificate">
-        <constructor-arg>
+    <bean id="edugainSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
             <bean class="java.io.File">
                 <constructor-arg value="#{ systemProperties['basedir'] }/feds/edugain/edugain-signer.crt"/>
             </bean>
-        </constructor-arg>
+        </property>
     </bean>
     
-    <bean id="edugainSigningKey" factory-bean="edugainSigningCertificate" factory-method="getPublicKey"/>
-    
     <bean id="checkEdugainSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkEdugainSignature"/>
-        <property name="verificationKey" ref="edugainSigningKey"/>
+        <property name="verificationCertificate" ref="edugainSigningCertificate"/>
         <property name="postProcessFilter">
             <bean class="uk.org.ukfederation.mda.ErrorAnnouncingFilteringStrategy"/>
         </property>
diff --git a/feds/edugate/import.xml b/feds/edugate/import.xml
index 8b096da0..cded2e9a 100644
--- a/feds/edugate/import.xml
+++ b/feds/edugate/import.xml
@@ -23,20 +23,17 @@
     <!--
         Edugate federation signing certificate.
     -->
-    <bean id="edugateSigningCertificate" class="edu.vt.middleware.crypt.util.CryptReader"
-        factory-method="readCertificate">
-        <constructor-arg>
+    <bean id="edugateSigningCertificate" class="net.shibboleth.ext.spring.factory.X509CertificateFactoryBean">
+        <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="#{ systemProperties['basedir'] }/feds/edugate/metadata-signer.crt"/>
+                <constructor-arg value="#{ systemProperties['basedir'] }/feds/edugate/edugate-signer.crt"/>
             </bean>
-        </constructor-arg>
+        </property>
     </bean>
     
-    <bean id="edugateSigningKey" factory-bean="edugateSigningCertificate" factory-method="getPublicKey"/>
-    
     <bean id="checkEdugateSignature" class="net.shibboleth.metadata.dom.stage.XMLSignatureValidationStage">
         <property name="id" value="checkEdugateSignature"/>
-        <property name="verificationKey" ref="edugateSigningKey"/>
+        <property name="verificationCertificate" ref="edugateSigningCertificate"/>
     </bean>
     
     <bean id="disassemble" class="net.shibboleth.metadata.dom.saml.EntitiesDescriptorDisassemblerStage">