[vidalia-svn] r3405: Clear the list of default CA certificates used by QSslSocket (in vidalia/trunk: . src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-12-30 13:48:55 -0500 (Tue, 30 Dec 2008)
New Revision: 3405

Modified:
   vidalia/trunk/CHANGELOG
   vidalia/trunk/src/vidalia/network/geoipresolver.cpp
Log:
Clear the list of default CA certificates used by QSslSocket before adding
the only one we care about. Suggested by coderman.


Modified: vidalia/trunk/CHANGELOG
===================================================================
--- vidalia/trunk/CHANGELOG	2008-12-30 14:49:54 UTC (rev 3404)
+++ vidalia/trunk/CHANGELOG	2008-12-30 18:48:55 UTC (rev 3405)
@@ -8,6 +8,8 @@
     separate HTML-formatted display.
   o Include new Vidalia graphics in the Windows Vidalia and bundle installers.
     The graphics were created by dr|z3d.
+  o Clear the list of default CA certificates used by QSslSocket before adding
+    the only one we care about. Suggested by coderman.
   o Support building with Visual Studio again.
   o Add a Debian package structure from dererk.
   o Updated Czech, Polish, Romanian and Turkish translations.

Modified: vidalia/trunk/src/vidalia/network/geoipresolver.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/geoipresolver.cpp	2008-12-30 14:49:54 UTC (rev 3404)
+++ vidalia/trunk/src/vidalia/network/geoipresolver.cpp	2008-12-30 18:48:55 UTC (rev 3405)
@@ -40,6 +40,7 @@
   _socksPort = 9050;
 
 #if defined(USE_QSSLSOCKET)
+  QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
   if (! QSslSocket::addDefaultCaCertificates(":/geoip/cacert_root.crt"))
     vWarn("Failed to add the GeoIP CA certificate to the default CA "
           "certificate database.");