From 9def8dc139087128090148246911b7fd17cf893a Mon Sep 17 00:00:00 2001
From: Ian Young <ian@iay.org.uk>
Date: Thu, 11 Nov 2010 17:06:25 +0000
Subject: [PATCH] Switch to using 2010 version of the UK federation signing
 certificate for signature verification.

---
 build.xml                                     |   4 ++--
 ...eration-2008.jks => ukfederation-2010.jks} | Bin 1184 -> 1184 bytes
 ...eration-2008.pem => ukfederation-2010.pem} |  20 +++++++++---------
 build/ukfederation.jks                        | Bin 1184 -> 0 bytes
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename build/{ukfederation-2008.jks => ukfederation-2010.jks} (52%)
 rename build/{ukfederation-2008.pem => ukfederation-2010.pem} (62%)
 delete mode 100644 build/ukfederation.jks

diff --git a/build.xml b/build.xml
index 70ea2d50..6eb12333 100644
--- a/build.xml
+++ b/build.xml
@@ -176,7 +176,7 @@
 	<!--
 		Verification keystore.
 	-->
-	<property name="keystore.uk.vfy.loc" value="${build.dir}/ukfederation.jks"/>
+	<property name="keystore.uk.vfy.loc" value="${build.dir}/ukfederation-2010.jks"/>
 	<property name="keystore.uk.vfy.alias" value="ukfederation"/>
 	
 	<property name="known.hosts" value="${build.dir}/known_hosts"/>
@@ -646,7 +646,7 @@
 				<args>
 					<arg value="--verifySignature"/>
 					<arg value="--certificate"/>
-					<arg value="${build.dir}/ukfederation-2008.pem"/>
+					<arg value="${build.dir}/ukfederation-2010.pem"/>
 					<!--
 					<arg value="- -quiet"/>
 					-->
diff --git a/build/ukfederation-2008.jks b/build/ukfederation-2010.jks
similarity index 52%
rename from build/ukfederation-2008.jks
rename to build/ukfederation-2010.jks
index 1be029caf279ddcf9f928c0680f09b1c2a4a8a91..2f107b63bb61b02ee077a8b15860fd8a99fdd1bf 100644
GIT binary patch
delta 379
zcmV->0fhdb37`p(At)-djOE7w1z0XMFgXAK1Y0nI1XnPE13#bx0s#U72>^-wsriUX
zgXob-j~p>DFgP+dF)}hXH8ENj4KXq?F)=nVGBP$bF<OyWeY0@^@c{^l{HghfN`vT=
zY6BvFk;vKrNzc~9-c{ZlRAihm8~3Y#4Gfrf5ow8w*1G339EL78EF#{~UGX!nUrWkl
z+?yT%pZB!WB-he=9x<<mI$cvhh;p<jSHvTdDk<NJND7JwsXLwqpzE7&Bs*?*y3y42
zULBM6uSlcyUyj86NvvtH768<{A`8voCF#C@bj3CtfBiLqFrD800pL&cT0Ee!HU9`=
zgOHLdY)(lQ`__pouG~&x;J&NV&OYmo^*@~^Lg$@U#AaP?qowYiD6sxy^Vtn6KWAiY
zuf>YP`?*#d6cyX`x^@{kLq90&Hh>lh8krsEOem-;-(-_@3Oe`$6TnBI1eK6zdyQ=t
Ze1@GkuBIXH>|=c?_nNS@mOY2Q&TvZ#st^DG

delta 379
zcmV->0fhdb37`p(At)Vkv8V(91z0XMFgXAK1Y0nI1XnPE13#bx0s#U72>^~({hG2`
zi@=ddj~p;KF)%YQF*h?cGB#Ql4KXk=F)=nVH#0RdHd>KbeY0@^@c{^qR{ff?T8qGw
zY6BvFd7~R-7Tr@2qb=&zed}*C`l~qhFOr882Y^@3+S=`@&lzI>WR0C3)6K($(6}I<
z+!YcxNHxZ>)+BSpLnW%i5-hFDJNq@s<i5*6CUDcGz`HhLLD>C@8UEIo05WPlH<g!i
z!r5vy>1V1&$V3gZFSWmu+9E)-Txex6D}khc4leU6S{j+s4&B7i*%MTagZ|A=7kg_Z
zPRF~x;$rC+DI9f-zPxMU{%yNj;i>^b1-l*kw7}qer$cAdjM}+_8l|v~F1Rgnx{g}_
z6`JRS8L9CvskzlEyeXMSkKkqhsm_u@0*vHQ<kw_bySsmQZXaFI7)B(KJ!&Ll`&!Kw
ZvF8i{I|bhS&${@<x61o;O_>RW?E&bNtl$6u

diff --git a/build/ukfederation-2008.pem b/build/ukfederation-2010.pem
similarity index 62%
rename from build/ukfederation-2008.pem
rename to build/ukfederation-2010.pem
index c2ea139e..be7c48eb 100644
--- a/build/ukfederation-2008.pem
+++ b/build/ukfederation-2010.pem
@@ -1,9 +1,9 @@
 -----BEGIN CERTIFICATE-----
-MIIEVzCCAz+gAwIBAgIJAI5W/ZqyWovAMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
+MIIEVzCCAz+gAwIBAgIJAIn8qfmISoPoMA0GCSqGSIb3DQEBBQUAMHoxCzAJBgNV
 BAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9u
 IGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0
-aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0wODEwMzAxNzM1MjZaFw0xMDExMTYxNzM1
-MjZaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVu
+aW9uIE1ldGFkYXRhIFNpZ25lcjAeFw0xMDA4MjcxMjI2NTFaFw0xMjExMTYxMjI2
+NTFaMHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBBY2Nlc3MgTWFuYWdlbWVu
 dCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJlc2VhcmNoMSYwJAYDVQQD
 Ex1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcjCCASIwDQYJKoZIhvcNAQEB
 BQADggEPADCCAQoCggEBAOqtfMvCmBuQudC4/jZFPYkHDNHFyp1FA3KJihIUXppF
@@ -16,11 +16,11 @@ HQ4EFgQUT0eEG4zGvMFg6PUqP/eC3MCC1QQwgawGA1UdIwSBpDCBoYAUT0eEG4zG
 vMFg6PUqP/eC3MCC1QShfqR8MHoxCzAJBgNVBAYTAkdCMUMwQQYDVQQKEzpVSyBB
 Y2Nlc3MgTWFuYWdlbWVudCBGZWRlcmF0aW9uIGZvciBFZHVjYXRpb24gYW5kIFJl
 c2VhcmNoMSYwJAYDVQQDEx1VSyBGZWRlcmF0aW9uIE1ldGFkYXRhIFNpZ25lcoIJ
-AI5W/ZqyWovAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAHmjG2QW
-3VMQoy3q1n3rbzP6qzj2L5KHFAeAV87a2u2pzxli/2SNnR7TzcOF0Lggn9wVEjdI
-Ncax1iRzxEMlqsMSLK3LO/s1yeS+y0EmcNOlwLs2YkHY/YoZ/taYADJqPTeVl3LC
-2Wo16WeqRshEDbMvtb+T2iJAtFxoZTErgaQOLvMrWhqZ0g7dxNDZE1SNg/7NTxd7
-ayVOx7u+4mLpFykcdYy+vGvh/m27WuGqAUIFux36tMDgfKdDZ9SM2rmDGqWwji64
-LXK6jlsAFZrnhBmp8S+pudUqvCmZR4/gZf+pzpJCAozkUeTXZFm7u394bh9d0RhG
-JJE9aiRj+1rNsec=
+AIn8qfmISoPoMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAJHI2gBJ
+z9bD3lXeHFRknDAb96uADQyYdxFpiYvWuuc0HIYuNywi3tFd8TOuX0vKZNybHgCf
+97TTJNfSex4xr4Y6XVNAiHK0KFfEI5IqKd+KSAqKCKk7ngag65tvJDtud7rR1PVe
+HZP2r0ij9V+OxP1JrGmxFgDUuyILzeEl6b50xTYcf/01gTCd3v0B4E/0WjygsTX/
+CGKDkJIrbE5JFvvWiSuu3E5h4L6r084+6471P50mQuedVsRmXW6jpe6eKLD+ZPPZ
+DSs/Z2Rsr8WKw/u5VhsUFdv1unYZOUM/KOw2gBYJGpkd50woqCvfZJN1Cjr4AxPA
+R6EElZBoe41tfIY=
 -----END CERTIFICATE-----
diff --git a/build/ukfederation.jks b/build/ukfederation.jks
deleted file mode 100644
index e4a32e473a1871fbc2da22c66c641829e5b7fc73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1184
zcmezO_TO6u1_mY|W(3nbrP*nzDXB$?C7JnoKtX=ir*FI&SR?dI4J;WLSfUM@Si%jO
znC%xZGchtTaWcGHkh}8hgHIm~c-c6$+C196^D;8BvN9M{8FCwNvN4CUun9A{I~h6~
zID$A_!d9W)3XaLisl~+#zKMB>>8ZJ?c_j*Na4Qwk@{1H)Q%aM;4p2zUOHl|)Ely1=
zO3pA;Gf)8;!YnKcGz3YDZ)!<mN@7W(LU3k!UTTqnoH(z6nW3SfxuL1Cfst_(kZS?t
znnAe(>b53ECFG!DWMyD(V&rEqXkz4IYGPz$c(u0X^r0Ej6LwzM@z2cFwv(Ob;?Yxc
zU73qIyM#pIX1VU$K4;C_4bl@<o?1{kbAHd1<v)6s3mYVO#ON-WV&8gdqpZq-MC;WT
zXUsgiOu~G}HJ?dmc~`W}oOMIy?R$&+GtaawIv##6L_3Q~_sEaNS(h`*w(Yy0vdiUM
zmqCfvf)h24JMXV|ku5&4h08(kv8wE|+fn7I&uTlaul$t#>0VaHly8fwHpcuodN*XN
z`<iO5XNf@zY<N2pyfXG>zP?^9JSSTxOV2s~W6B!eUiB7>vTf%R&nV43s`1zL^Sayp
zMN$8z7r8W9=kpuCW|zs=cG=&+lAW{W=QclXo}Ch#?D(}}M7^IfF*7nSE^fSU(0Io{
z78u*Id@N!tBL40z(mlua987reRm=W+)13oNS6K`i*MQ`eSsIrZG%jqws%Bx`lA3{x
z?k1!R!UJ-xFbk^zGb7`F<TL=xF2FRv$k6dt=EI)U^^+aWots{K@K^WQq<0JaMfdf+
zO+3yN^UFs`IXS;Fqg}^jf9X;u{~W1hwF|F@9oWWNxvp^6TJ>FGp;C4)MU6G?ufDK&
z=Gybh?v*==Zv^<8uRm~HKW10bQRWUUrM0geBt!lz>*Ldjod3T&D<y2}gW6)wwbed%
zL|%sN|K6lkx_8gMUafBxjtL*4f3JIfuIuBu!l{QoT>hi_wIt<g^7f2-E$#1q=ilcL
zFlRMfkf?cUO6+C3Egb3DEADPSF6S?$To&@TzclP3r&L^taF1b$>ZPAzqTPviezIxF
z7HvPkAM&Yv;tlP8Zi^@0Nqc6j-~F(lF!SD2%PzI2**AnAtdr9@mMovB{G@lf#iGkj
JQ#xl#0sxWz&dmS-