[vidalia-svn] r4247: Apparently bridges.torproject.org got a new certificate from (in vidalia/trunk: . src/vidalia src/vidalia/res)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-04-02 16:45:44 -0400 (Fri, 02 Apr 2010)
New Revision: 4247

Added:
   vidalia/trunk/src/vidalia/res/EquifaxSecureCA.crt
Removed:
   vidalia/trunk/src/vidalia/res/EntrustSecureServerCA.crt
Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/Vidalia.cpp
   vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:

Apparently bridges.torproject.org got a new certificate from a different
CA. So, add the new CA certificate and remove the old one so the "Find
Bridges Now" button works again.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2010-04-02 12:18:31 UTC (rev 4246)
+++ vidalia/trunk/CHANGELOG	2010-04-02 20:45:44 UTC (rev 4247)
@@ -2,6 +2,8 @@
   o Stop using our custom dock icon implementation on OS X and just use
     QSystemTrayIcon everywhere. Fixes the build on Snow Leopard.
     (Ticket #562)
+  o Update the bundled CA certificates to re-enable downloading bridges
+    from bridges.torproject.org via SSL.
   o Include a pre-configured qt.conf file in the Mac OS X bundles that
     disable Qt plugin loading from the default directories. Otherwise,
     users who have Qt installed in a system-wide location would end up

Modified: vidalia/trunk/src/vidalia/Vidalia.cpp
===================================================================
--- vidalia/trunk/src/vidalia/Vidalia.cpp	2010-04-02 12:18:31 UTC (rev 4246)
+++ vidalia/trunk/src/vidalia/Vidalia.cpp	2010-04-02 20:45:44 UTC (rev 4247)
@@ -503,9 +503,9 @@
     vWarn("Failed to add the GeoIP CA certificate to the default CA "
           "certificate database.");
 
-  if (! QSslSocket::addDefaultCaCertificates(":/pki/EntrustSecureServerCA.crt"))
-    vWarn("Failed to add the Entrust Secure Server CA certificate to the "
-          "default CA certificate database.");
+  if (! QSslSocket::addDefaultCaCertificates(":/pki/EquifaxSecureCA.crt"))
+    vWarn("Failed to add the Equifax Secure CA certificate to the default CA "
+          "certificate database.");
 
   if (! QSslSocket::addDefaultCaCertificates(":/pki/gd-class2-root.crt"))
     vWarn("Failed to add the GoDaddy Class 2 CA certificate to the "

Deleted: vidalia/trunk/src/vidalia/res/EntrustSecureServerCA.crt

Added: vidalia/trunk/src/vidalia/res/EquifaxSecureCA.crt
===================================================================
--- vidalia/trunk/src/vidalia/res/EquifaxSecureCA.crt	                        (rev 0)
+++ vidalia/trunk/src/vidalia/res/EquifaxSecureCA.crt	2010-04-02 20:45:44 UTC (rev 4247)
@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAomgAwIBAgIENd70zzANBgkqhkiG9w0BAQUFADBOMQswCQYDVQQGEwJV
+UzEQMA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2Vy
+dGlmaWNhdGUgQXV0aG9yaXR5MB4XDTk4MDgyMjE2NDE1MVoXDTE4MDgyMjE2NDE1
+MVowTjELMAkGA1UEBhMCVVMxEDAOBgNVBAoTB0VxdWlmYXgxLTArBgNVBAsTJEVx
+dWlmYXggU2VjdXJlIENlcnRpZmljYXRlIEF1dGhvcml0eTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAwV2xWGcIYu6gmi0fCG2RFGiYCh7+2gRvE4RiIcPRfM6f
+BeC4AfBONOziipUEZKzxa1NfBbPLZ4C/QgKO/t0BCezhABRP/PvwDN1Dulsr4R+A
+cJkVV5MW8Q+XarfCaCMczE1ZMKxRHjuvK9buY0V7xdlfUNLjUA86iOe/FP3gx7kC
+AwEAAaOCAQkwggEFMHAGA1UdHwRpMGcwZaBjoGGkXzBdMQswCQYDVQQGEwJVUzEQ
+MA4GA1UEChMHRXF1aWZheDEtMCsGA1UECxMkRXF1aWZheCBTZWN1cmUgQ2VydGlm
+aWNhdGUgQXV0aG9yaXR5MQ0wCwYDVQQDEwRDUkwxMBoGA1UdEAQTMBGBDzIwMTgw
+ODIyMTY0MTUxWjALBgNVHQ8EBAMCAQYwHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gj
+IBBPM5iQn9QwHQYDVR0OBBYEFEjmaPkr0rKV10fYIyAQTzOYkJ/UMAwGA1UdEwQF
+MAMBAf8wGgYJKoZIhvZ9B0EABA0wCxsFVjMuMGMDAgbAMA0GCSqGSIb3DQEBBQUA
+A4GBAFjOKer89961zgK5F7WF0bnj4JXMJTENAKaSbn+2kmOeUJXRmm/kEd5jhW6Y
+7qj/WsjTVbJmcVfewCHrPSqnI0kBBIZCe/zuf6IWUrVnZ9NA2zsmWLIodz2uFHdh
+1voqZiegDfqnc1zqcPGUIWVEX/r87yloqaKHee9570+sB3c4
+-----END CERTIFICATE-----

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-04-02 12:18:31 UTC (rev 4246)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-04-02 20:45:44 UTC (rev 4247)
@@ -305,7 +305,7 @@
     </qresource>
     <qresource prefix="/pki">
         <file>cacert_root.crt</file>
-        <file>EntrustSecureServerCA.crt</file>
+        <file>EquifaxSecureCA.crt</file>
         <file>gd-class2-root.crt</file>
     </qresource>
 </RCC>