--- a/ui/tests/data/valid_ssl_rsa.pem	Fri Mar 28 13:04:59 2014 +0100
+++ b/ui/tests/data/valid_ssl_rsa.pem	Fri Mar 28 13:05:21 2014 +0100
@@ -1,82 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFSDCCAzCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MRIwEAYDVQQDEwkxMjcu
-MC4wLjExGjAYBgNVBAoTEURvX05vdF9UcnVzdF9UZXN0MQswCQYDVQQGEwJERTAe
-Fw0xMzAxMDEwMDAwMDBaFw0xNTEyMzEyMzU5NTlaMD0xEjAQBgNVBAMTCTEyNy4w
-LjAuMTEaMBgGA1UEChMRRG9fTm90X1RydXN0X1Rlc3QxCzAJBgNVBAYTAkRFMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAopptJLmLZ4ii6CVbbpUFgTzS
-bde9qY2D77zX6ojING773lN/pJ1KMJCYxsvRsxLzIwqWKTPGUssAu3qJ5Rgh56kR
-addTEQBr+Ej0fZeZrwDT+ytgOyjA/CGFqr4/RC17UL19x4dkhTbIeyu+UYbw/oJ8
-Iid+I6dxG/tn+76uptxNSvwNgbdIl6kWszWSTXiITe5qLSwIHwsZghDQuR0po6WC
-/70J7Lq1v+RxQwsAmhrgQBn5wBoTUpUq8H1yuHnw2XdNq+yYqCiP7x1Pk8Ukfe4/
-0fo0zB5tEQd+7Y6/dXbW3e3dPPkgnSG+ivCkzTCFC4sK50kcxKRFfJP8zHZqMWPN
-iaACgAALfnwDrRI6c6idKfEmzt0dWAEsYqAY+E/20Q7+aWK5Z1eFPYjhk4s3Y6cu
-+KT4il5YDegpHbZhB1QRoyrk3nfID/lEI/G9L5+m9z/MJo9WLAK6fHuZpj7LLshl
-VAeq14jZ/t2EaIyvfFv4x7iYBGSs9x4thJGux4lHfkoY5YTaKhK14Z+HL1Krtda7
-jh5zRw6RA9cV99JXGeaMzbFlDBAZGIxLnpT+Y/4lguRzx+Q4RA4/77UlKgbWeNZ8
-k+bvC+Mk89S8Z8zwq+UZj97br++PlkU84Gx9jIwxAz3c6VZJE+89OWXHc9d0w0Ls
-9UgNzMxgss+ah168L2kCAwEAAaNTMFEwDwYDVR0TBAgwBgEBAQIBADAdBgNVHQ4E
-FgQUOlzB4teo19CJHP/S80j1NPyOykcwHwYDVR0jBBgwFoAUOlzB4teo19CJHP/S
-80j1NPyOykcwDQYJKoZIhvcNAQEFBQADggIBAJAgR7g1INXRzNNUevGLH7FsJetk
-H2gp9poDjWJdu6PvQ+9EZqIfmEpbTzHg23cDVnpbiwfemM4J1rZrOC8DJNJldhNB
-NGmDk11/BwhespGrtvtJqiqAL/5j/Yu/6LcjJdYJJ9XBK75SV5wV4BHtllRH7/kd
-I7hLEpd1suzh58FjbcqBRVA75O2UyvSdeZhJ7s0ZBlRFQ6cK6nNtpjf1IDUREvEO
-AJPekWYaABY/9BZHfHdqiRAwBlXZprV2jm7dtm4ViLBvFAWNt/CsC98cumw36VBO
-MdMxn/v9exYXCkICUxEOvqN2EmfRkRRvL7eLRxnYbd4ytC9Ir9APNEYrL40GPZmz
-1N9DPJMqqEJ2Af19+86Yy8eXOCLkInf8G5H5Df5o8QH1xGtU02iXlBpRE3etWYyY
-QVkSRUrnM8F3pQ29BoNvgfdeOL1SynlDO6YGaNsKchDx+rjEzCud/m+0HwH1xYwU
-HLb7Yb2xlfQ77Wyv/limbxAGve3zKjrvZWkQD2q3+WaVg13wyk47B3sBKEhDoL4u
-iXurAOwK9/KLaGJ+f8OLueWPFourubRfLdBwm0+N9KLZZheYAg/PNxONFm19OkiF
-79Aw2pFUPO9rqa0AZalTM11BjXSac1rL5JvyPZ2k4Vz4Ks0Hbk5BPgOWaTSY4Ma6
-64TGCizBljmAt7iI
+MIIFWjCCA0KgAwIBAgIBATANBgkqhkiG9w0BAQUFADBGMRswGQYDVQQDExJUZXN0
+Um9vdENBRGVsZXRlMTUxGjAYBgNVBAoTEURvX05vdF9UcnVzdF9UZXN0MQswCQYD
+VQQGEwJERTAeFw0xMzAxMDEwMDAwMDBaFw0xNTEyMzEyMzU5NTlaMEYxGzAZBgNV
+BAMTElRlc3RSb290Q0FEZWxldGUxNTEaMBgGA1UEChMRRG9fTm90X1RydXN0X1Rl
+c3QxCzAJBgNVBAYTAkRFMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+pXruCXpcRHH3HgPfj3nYhUrq59bycO/Ur8cvWbYMRbYAKrbxaUYlwsndzycbPu2D
+2W8p4HiYtZlei+rYhRMy/WZK0zbKdJdYYGmpSyxmd144Jhys+Ae9qAggQVmrwgDT
+ktXIE6TGxhO3gUGIMZNIRvUf7OhD29I1ETcruOzbmGaGnGKqFQ9PHTNyvi0rcY7+
+UV5tVm/cJR7JrUwvLcvj0boTYorFNfgThgOLGdH8lyUVoxHB+fvs1YbuzV2/YQDi
+H/P+6+2Maxz5/Ot/QW3G/pYEWUJmZrjLpVoosluyNfil/BJBYmpIDSynt9YKegKs
+wY01ov9AAHMQ+FVz2ehGconjaPmn9TMJ8pPmJDfwjj0+C/NA6Gm5LfGHSGDQNuhS
+jLJJcp/00fedJjYDmRWzknqqwmUps07X1SRQn9uSi64iGnAVVdzWE4NXYjWBQMFq
+XhbA/zIhfPf8t6+hBVuc13ZaBEKoQ3cl6xMexGxzVDaOpRX7N6nVFFR/5v7XoSCQ
+XvJRPF5wD/mHm1xVAS/OCGOEVFXpbkKLwgOLQVPJAkJ5TcDpYeO/l35fI6uRnjju
+bLAejGwAn7ltKmu4fV3IeDLzvTLbBv5GGV+scgq374qVKoeZfnEDn2k1oPoEbT3q
+DUImFaqS3KyGyaaWnQieMK/3yDIV8qdCIOFmQTBWufMCAwEAAaNTMFEwDwYDVR0T
+BAgwBgEBAQIBADAdBgNVHQ4EFgQUWvUyxs6DqllXZfXx53D1tF5kisUwHwYDVR0j
+BBgwFoAUWvUyxs6DqllXZfXx53D1tF5kisUwDQYJKoZIhvcNAQEFBQADggIBAAgg
+SRwIzEUOEB37O0ZaIIM3e0moPK2G3d4YMf/bjBNlMuByMvXNSoHZWEefo3s2Mtne
+J3Xqknp5meEMoiysWHxNWsbZIUTs8pWBL/410CEicXJGZev0a3F1zzBYCf3Ly+hG
+48H9MTL/y5a+vDXmUsijz7sw66sWoLKnxPlkTbZJQfgk3aH1zVPWrlysiR0zAzQD
+znha5IQizHthBoEKwpNXeztvRpjAVOapRGDkI6A8eZbBIwACjeuZv1sdDB8vT27H
+QAX8LEU3LVGtPkWRNtN8mSIgyewTGnCOJaktwCsE1NzkbqAyHTd1ajrCOntNm2U3
+tC9E5tnR8zp+U5rzWXh64rmSWUBrKyaCxI/kap3JxCs9+77zmH5PjSda5pmVi9AZ
+/6lsu47p/0JXMNGC+Ffvq9FhrtUM/vpkVX37odJU/MlZxnX75tguJ4uhtVKnYv1D
+5cxZwz6XWKg3M/lIo3Ypy3jw27ZCNJ67eDQVXPzJ1u3fpZiMK8gL+QsS91b2gECd
+AZsHz8GihsGapU6XzM6/Orz0WUIc8e9bv0dGevTO/iMUw5ldQVj/s43RIYaKXzd/
+c5/gBqeMzacXOR3vOTzWhU7Qt9Yp2llvBt4+fTvMTbdor3MAXfI6SUdWNIBihg/d
+GQvixl3iBmuG1Xpzg1lWK5TtvUk6X41KwZZHj8Jr
 -----END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-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
------END RSA PRIVATE KEY-----