From 0c37a5b345228967f50a9d26503481ce2a1e85bd Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 12 Nov 2014 09:59:43 +0000
Subject: [PATCH] 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.
---
 build.xml                    |   4 ++--
 mdx/uk/beans.xml             |   2 +-
 mdx/uk/ukfederation-2012.jks | Bin 1040 -> 0 bytes
 mdx/uk/ukfederation-2012.pem |  23 -----------------------
 4 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 mdx/uk/ukfederation-2012.jks
 delete mode 100644 mdx/uk/ukfederation-2012.pem

diff --git a/build.xml b/build.xml
index 9dbc2387..1ce4089d 100644
--- 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
index ef90c323..6d9aa598 100644
--- 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
deleted file mode 100644
index 6f3fff5ae1c48e8af3fa30579621918c9d0d8c08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1040
zcmezO_TO6u1_mY|W(3nbrP*nzDXB$?C7JnoKtU^iH|r7x)(AaQ14{-5=F<jE%*PFy
znAR^~W@2Pw;$*n7QP17U=XSmUFB_*;n@8JsUPeY%RtAGALv903Hs(+kHen`rCqrig
zM-YdL$12oY!7({GwYXTpH!&|UJvBEquSCHOZlyw6evyJ}N@+6K0SbwEDGEWU#i@x!
z$r*-f1}Y#!n0aJ@h9GJ2O)W`GNi0cJ2+mB;OD!^x6X!KFGBhwWG%z=?FtmsQa!m{k
z4b7n30d-pwqY`pZF|sl+H!<=v7&I|*F*PwVGQ3(_bNbK>=?Ob8?D%KqYTL=qbMfe@
zxvtDbon1mAakE_aZJ)E|?FQ)yD^D#bojJc}%JLsQ%Y_XRJYsa0OtEi0wNX~(K%({P
zi!)}PT_$0^<C@Q;v%D+XX3n}H^Y*>P{h4Rl799`27owfTq<iE?<E+b>W!v`MPub;i
zuFIfAYr%;c$DQ}ryT}%w*uv!?_*hl;+3l$E)MvFF*H?bZ{&X*^W6HNhRU2b|9K9Q|
z)qPDh*R#Z+1vb2$30@idGGAY>7M_!>lcndJ|1o8aZ?AfbMcKCViD#7N9@Y5k`gz^$
z{-UUV(~Df1tn>MeU$e{PYrE`kV9Cx|^K+XYH_uLqO?LcRF{0j2nV1<F7#9Z^_!-Co
z<64%FMT|wn-@Qe;=h&Wu2`|2C*?(`kbD-%ei-9~yTA4+{K&%0~0v?b8VHQ>cW=6*U
z$YBmlp1?3?WRRKpOl)G?et{KQHoVDOSFxr9O}=>b{SmSF&EadmSDpMRF~?(qedXS@
z-pBr1uq7Szv2WR0d)dnCdf_4ND<7sz$n3u_n$vzi?c7lpsr1X-K6)R%F`p0B4`$&m
zvam{IID03v;fkwR)7?4x2P>TW-(>ZuOze1jnYGRNOK&^pv1qQ0hY^$Kb(C+oq5X{c
z__UtGQchn@K5oqyPdhESWc|KBCwzjwOR;eGH_ppDuw>5qyRzM1e-(0mR2J@zzqfUf
zC({?Nb8%ZIyMJ4`;oZTR??t~fueviy|Mk=Uyi5OIyR1H8&2OKOx|2QmyORCOjH#Qm
tj^&h{P`)(bWZp}&%MwLrM0fFjn)@<Lt=6?aL^|K4Q#wRJ_t1>(#{i28nvnni

diff --git a/mdx/uk/ukfederation-2012.pem b/mdx/uk/ukfederation-2012.pem
deleted file mode 100644
index a1f3a57a..00000000
--- a/mdx/uk/ukfederation-2012.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDxzCCAq+gAwIBAgIJANixLkdCTNtvMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
-BAYTAkdCMUMwQQYDVQQKDDpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9u
-IGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQDDB1VSyBGZWRlcmF0
-aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0xMjEwMTEwNzA4MThaFw0xNDExMTYwNzA4
-MThaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKDDpVSyBBY2Nlc3MgTWFuYWdlbWVu
-dCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQD
-DB1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOqtfMvCmBuQudC4/jZFPYkHDNHFyp1FA3KJihIUXppF
-vrecrO2wG5CpyqB1mZ+MlKf4jKcTMGBIXC2klD+FyrEdJMBhO6vRmJnNphg3uNZM
-ks0NqIaZmtgc7e8435nMhqLHV95UK2oCLcT4gZrTaXa2vt9kukTOijB0KqDIfEG5
-369EHXPItApAEeMlHebbWndl5n2I16nya/LeaoiU9qJ6sVz4xd1UtUesewrmYVKg
-PA2JYEpovmnr13sTnGssai5Db/FkrE2NJ4Q4drbPYcwincUo/UXzrtuPclr+l3JE
-gjtvDzPrBxxvK0S/gARrbKz5tk4LDLkYsj4PKlwVS+UCAwEAAaNQME4wHQYDVR0O
-BBYEFE9HhBuMxrzBYOj1Kj/3gtzAgtUEMB8GA1UdIwQYMBaAFE9HhBuMxrzBYOj1
-Kj/3gtzAgtUEMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAByZ5haR
-hr8QqCo8DWO1qgVkUpPR1e/EFl+zV633esn5GJxIkD95va1Lxv84BmLBTD+EtX3T
-OkrXccIL1PCUkGmP3xVsh99mzsVEGmfTC0wu8PYDz1UvUwQLcjg6YQDN3GmA1EUW
-gt2cL8F4Q4/saowkkYjt0wWGQ/SNhwnGWwpo4ViTnoh3sNgr5gPHlozDGkL1NPG1
-bxdmyxmkr778yExS9xoEC4+Bnm7ApJyv3R2L9fpxCfEjE4tf3rWiSQL0Ss5etZNH
-9qmw7sGZ7xX0g6rcki/r5Y9u0v/rRKvIOw8/YGW5B2P3Ij/paJWzasZsdsgj0pDJ
-buk20xhyzBW6D/I=
------END CERTIFICATE-----