[vidalia-svn] r4299: Dear GoDaddy: Yes, Danica Patrick is hot. We get it. But, no (in vidalia/trunk: . src/vidalia src/vidalia/res)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-05-20 18:04:40 -0400 (Thu, 20 May 2010)
New Revision: 4299

Removed:
   vidalia/trunk/src/vidalia/res/gd_bundle.crt
Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/Vidalia.cpp
   vidalia/trunk/src/vidalia/res/vidalia.qrc
Log:

Dear GoDaddy: Yes, Danica Patrick is hot. We get it. But, no, that doesn't
make your SSL certificate prices any more palatable.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2010-05-19 06:34:24 UTC (rev 4298)
+++ vidalia/trunk/CHANGELOG	2010-05-20 22:04:40 UTC (rev 4299)
@@ -1,7 +1,8 @@
 0.2.9   xx-xxx-2010
-  o Update the GoDaddy CA certificate bundle used to authenticate
-    connections to geoips.vidalia-project.net for downloading GeoIP
-    information.
+  o Remove the GoDaddy CA certificate bundle since we changed the
+    certificate used to authenticate connections to
+    geoips.vidalia-project.net for downloading GeoIP information from a
+    commercial GoDaddy certificate to a free CACert certificate.
   o Define -D_WIN32_WINNT=0x0501 on Windows builds so that MiniUPnPc will
     build with the latest versions of MinGW.
   o Modify miniupnpc.c from MiniUPnPc's source so that it will build on

Modified: vidalia/trunk/src/vidalia/Vidalia.cpp
===================================================================
--- vidalia/trunk/src/vidalia/Vidalia.cpp	2010-05-19 06:34:24 UTC (rev 4298)
+++ vidalia/trunk/src/vidalia/Vidalia.cpp	2010-05-20 22:04:40 UTC (rev 4299)
@@ -514,9 +514,5 @@
   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_bundle.crt"))
-    vWarn("Failed to add the GoDaddy certificate bundle to the default "
-          "CA certificate database.");
 }
 

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

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-05-19 06:34:24 UTC (rev 4298)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-05-20 22:04:40 UTC (rev 4299)
@@ -306,6 +306,5 @@
     <qresource prefix="/pki">
         <file>cacert_root.crt</file>
         <file>EquifaxSecureCA.crt</file>
-        <file>gd_bundle.crt</file>
     </qresource>
 </RCC>