Switch over to using the 2014 certificate for verification.

This is a nominal change, as the key embedded in the signing certificate has not changed.
internet2 · Nov 12, 2014 · 0c37a5b · 0c37a5b
1 parent 024212e
commit 0c37a5b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 26 deletions.
diff --git a/build.xml b/build.xml
@@ -609,7 +609,7 @@
         <attribute name="i"/>
         <sequential>
             <MDT i="@{i}" o="${null.device}"
-                keystore="${mdx.dir}/uk/ukfederation-2012.jks"
+                keystore="${mdx.dir}/uk/ukfederation-2014.jks"
                 alias="${keystore.uk.vfy.alias}"/>
         </sequential>
     </macrodef>
@@ -702,7 +702,7 @@
                 <args>
                     <arg value="--verifySignature"/>
                     <arg value="--certificate"/>
-                    <arg value="${mdx.dir}/uk/ukfederation-2012.pem"/>
+                    <arg value="${mdx.dir}/uk/ukfederation-2014.pem"/>
                     <!--
                     <arg value="- -quiet"/>
                     -->

diff --git a/mdx/uk/beans.xml b/mdx/uk/beans.xml
@@ -74,7 +74,7 @@
     <bean id="uk_signingCertificate" parent="X509CertificateFactoryBean">
         <property name="certificateFile">
             <bean class="java.io.File">
-                <constructor-arg value="${basedir}/mdx/uk/ukfederation-2012.pem"/>
+                <constructor-arg value="${basedir}/mdx/uk/ukfederation-2014.pem"/>
             </bean>
         </property>
     </bean>

diff --git a/mdx/uk/ukfederation-2012.jks b/mdx/uk/ukfederation-2012.jks
diff --git a/mdx/uk/ukfederation-2012.pem b/mdx/uk/ukfederation-2012.pem