[vidalia-svn] r4409: We don't need the CACert certificate anymore since we don't (in vidalia/trunk/src/vidalia: . res)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2010-08-26 13:30:56 -0400 (Thu, 26 Aug 2010)
New Revision: 4409

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

We don't need the CACert certificate anymore since we don't do remote
geoip lookups.


Modified: vidalia/trunk/src/vidalia/Vidalia.cpp
===================================================================
--- vidalia/trunk/src/vidalia/Vidalia.cpp	2010-08-26 17:18:15 UTC (rev 4408)
+++ vidalia/trunk/src/vidalia/Vidalia.cpp	2010-08-26 17:30:56 UTC (rev 4409)
@@ -507,10 +507,6 @@
 {
   QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
 
-  if (! QSslSocket::addDefaultCaCertificates(":/pki/cacert_root.crt"))
-    vWarn("Failed to add the CACert 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.");

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

Modified: vidalia/trunk/src/vidalia/res/vidalia.qrc
===================================================================
--- vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-08-26 17:18:15 UTC (rev 4408)
+++ vidalia/trunk/src/vidalia/res/vidalia.qrc	2010-08-26 17:30:56 UTC (rev 4409)
@@ -304,7 +304,6 @@
         <file>map/world-map.png</file>
     </qresource>
     <qresource prefix="/pki">
-        <file>cacert_root.crt</file>
         <file>EquifaxSecureCA.crt</file>
     </qresource>
     <qresource prefix="/geoip">