From 6775e9a6d40922f7df60b07521768ba4e09ce8da Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Wed, 12 Dec 2012 10:31:29 +0000
Subject: [PATCH] No longer necessary to test against the 2010 signing
 certificate.

---
 build.xml                   |  13 -------------
 build/ukfederation-2010.jks | Bin 1184 -> 0 bytes
 build/ukfederation-2010.pem |  26 --------------------------
 3 files changed, 39 deletions(-)
 delete mode 100644 build/ukfederation-2010.jks
 delete mode 100644 build/ukfederation-2010.pem

diff --git a/build.xml b/build.xml
index 83c99aac..5a5f33ce 100644
--- a/build.xml
+++ b/build.xml
@@ -498,9 +498,6 @@
 	<macrodef name="MDT.VFY.uk">
 		<attribute name="i"/>
 		<sequential>
-			<MDT i="@{i}" o="${null.device}"
-				keystore="${build.dir}/ukfederation-2010.jks"
-				alias="${keystore.uk.vfy.alias}"/>
             <MDT i="@{i}" o="${null.device}"
                 keystore="${build.dir}/ukfederation-2012.jks"
                 alias="${keystore.uk.vfy.alias}"/>
@@ -576,16 +573,6 @@
 	<macrodef name="XMLSECTOOL.VFY.uk">
 		<attribute name="i"/><!-- input file, assumed to be in the XML directory -->
 		<sequential>
-			<XMLSECTOOL i="@{i}">
-				<args>
-					<arg value="--verifySignature"/>
-					<arg value="--certificate"/>
-					<arg value="${build.dir}/ukfederation-2010.pem"/>
-					<!--
-					<arg value="- -quiet"/>
-					-->
-				</args>
-			</XMLSECTOOL>
             <XMLSECTOOL i="@{i}">
                 <args>
                     <arg value="--verifySignature"/>
diff --git a/build/ukfederation-2010.jks b/build/ukfederation-2010.jks
deleted file mode 100644
index 2f107b63bb61b02ee077a8b15860fd8a99fdd1bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1184
zcmezO_TO6u1_mY|W(3nbrP*nzDXB$?C7JnoKtZj|Jx`A_utw;a8dx$gutXa)v4k5m
zG21U-W@2Pw;$-Ojv+`$$SMv)4UN%mxHjlRNyo`*jtPBQKhTI06Y|No7Y{E?LPKM3~
zjvx+~uvMtHf@5-WYH_iGZ(?3zdTMTJUWtMm+)9PC{2~R{l+t9d0~8YTQWSzxi&GPe
zk~0j|3{*gdFbm594MEc4n_7~Xl30?c5S*Ewms(^XC(dhVU|?ZnZfIm=W@;D(<Qf?o
z8k#}51M0RWMkVB+Vq|4tZerwTFlb`rVrpV!WO%i<=JcT%(i3)G*zwQI)wYwJ=i<>*
zb6uH>I=h5K;%2$-+dgN_+YQnaR-Rf=I&*%{l;uBqmJ1ssc*N)~nPT61YNM>mfkf-o
z7iY{oyG+7-$2FfxXL(n&&75^Z=Iwin`!mn9Ejk{4FGM?wN%zQ)##xs$%eL*ipR&v4
zT$e$K)`Al?jyvzKcabeVv4zV)@Ug1wv)fVSsn2RVuCM%*{pns-$CPi2sy4>_IC?i^
ztNWU2u4jos3v75h6TC9^Wxl>%Ej%Y%Cri&c|6|G;-(K|=i?VI!6VE8kJ*x57_4B&h
z{Y6p#rWd(1S?BW`zh;-o*LK<8z>=M_=I1s)Zl0YIo9y_tVnn^4GBGnUFfMMqZ_s$h
zKo%I=vV1IJEF%8yEz&*5_8d%j@m0(Id()i*O;=eA8rOj2m022>7&I<yz^Z0p-IAJt
zjP53+48j9)tuPC#0W%}xf8;a(%r3w*z{oK1#4QHT^VbgF3%w^3k}}6Y`upkzUY;4{
zf|;G&*LFQOk!jO2*HOB6G4`YJx_IwXDR*YeG0gwI<+954OVx6Q>)WhigB?1GwrGSO
zQJ$owdB4kptBYf$^*pu(uV?40Sm%}Rx_ISlob2Rp>pd2Kjqf}1*K<wgMlpsfyOp@l
zK2&|VujHtiO#NTeMuWNc{xUxB{}N@hV58}Oj-=)ZleBaEJjH%r>(pL%$1m~0zSWn{
z*}d-jYCl)a>G|BSBWbaDi<iEer?KH*%IBNB+V<%wIqQ#h9sa#DOj<<r_Saoyl9tZ)
z8gI-R#5kp9%0BneSfPDCWpXK()emOj1MUl1rcTJH?#-=fn`^Odnd195$+eo_XKmOr
K&9;5txdH%F@5-P6

diff --git a/build/ukfederation-2010.pem b/build/ukfederation-2010.pem
deleted file mode 100644
index be7c48eb..00000000
--- a/build/ukfederation-2010.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIJAIn8qfmISoPoMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
-BAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9u
-IGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0
-aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0xMDA4MjcxMjI2NTFaFw0xMjExMTYxMjI2
-NTFaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVu
-dCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQD
-Ex1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAOqtfMvCmBuQudC4/jZFPYkHDNHFyp1FA3KJihIUXppF
-vrecrO2wG5CpyqB1mZ+MlKf4jKcTMGBIXC2klD+FyrEdJMBhO6vRmJnNphg3uNZM
-ks0NqIaZmtgc7e8435nMhqLHV95UK2oCLcT4gZrTaXa2vt9kukTOijB0KqDIfEG5
-369EHXPItApAEeMlHebbWndl5n2I16nya/LeaoiU9qJ6sVz4xd1UtUesewrmYVKg
-PA2JYEpovmnr13sTnGssai5Db/FkrE2NJ4Q4drbPYcwincUo/UXzrtuPclr+l3JE
-gjtvDzPrBxxvK0S/gARrbKz5tk4LDLkYsj4PKlwVS+UCAwEAAaOB3zCB3DAdBgNV
-HQ4EFgQUT0eEG4zGvMFg6PUqP/eC3MCC1QQwgawGA1UdIwSBpDCBoYAUT0eEG4zG
-vMFg6PUqP/eC3MCC1QShfqR8MHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBB
-Y2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJl
-c2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcoIJ
-AIn8qfmISoPoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJHI2gBJ
-z9bD3lXeHFRknDAb96uADQyYdxFpiYvWuuc0HIYuNywi3tFd8TOuX0vKZNybHgCf
-97TTJNfSex4xr4Y6XVNAiHK0KFfEI5IqKd+KSAqKCKk7ngag65tvJDtud7rR1PVe
-HZP2r0ij9V+OxP1JrGmxFgDUuyILzeEl6b50xTYcf/01gTCd3v0B4E/0WjygsTX/
-CGKDkJIrbE5JFvvWiSuu3E5h4L6r084+6471P50mQuedVsRmXW6jpe6eKLD+ZPPZ
-DSs/Z2Rsr8WKw/u5VhsUFdv1unYZOUM/KOw2gBYJGpkd50woqCvfZJN1Cjr4AxPA
-R6EElZBoe41tfIY=
------END CERTIFICATE-----