From f32ec93caf27312deaf01cb9cae6f51a94ce381a Mon Sep 17 00:00:00 2001 From: nowrep Date: Sun, 24 Feb 2013 10:52:31 +0100 Subject: [PATCH] NetworkManager: Use certificates from bundle only on Windows. On other platforms, let's just use system certificates. --- CHANGELOG | 1 + src/lib/network/networkmanager.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index d29f54c3c..cc1721079 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ Version 1.4.0 * disabled by default opacity effect on tab previews - see BUILDING * improved showing navigation toolbar in fullscreen * moved config directory into ~/.config/qupzilla + * certificates bundle is now only used on windows * fixed opening browser with url with ampersand (%26) as command line argument * fixed scrolling to anchor in background tabs * fixed parsing UTF-8 filenames in Content-Disposition header diff --git a/src/lib/network/networkmanager.cpp b/src/lib/network/networkmanager.cpp index 4b6f93ca3..ffa5645e1 100644 --- a/src/lib/network/networkmanager.cpp +++ b/src/lib/network/networkmanager.cpp @@ -109,7 +109,6 @@ void NetworkManager::loadSettings() QSslConfiguration config = QSslConfiguration::defaultConfiguration(); config.setPeerVerifyMode(QSslSocket::VerifyNone); QSslConfiguration::setDefaultConfiguration(config); -#endif QString certDir = mApp->PROFILEDIR + "certificates"; QString bundlePath = certDir + "/ca-bundle.crt"; @@ -129,6 +128,9 @@ void NetworkManager::loadSettings() } QSslSocket::setDefaultCaCertificates(QSslCertificate::fromPath(bundlePath)); +#else + QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates()); +#endif m_proxyFactory->loadSettings(); } @@ -664,7 +666,9 @@ void NetworkManager::loadCertificates() QSslSocket::setDefaultCaCertificates(m_caCerts + m_localCerts); +#ifdef Q_OS_WIN new CaBundleUpdater(this, this); +#endif } void NetworkManager::disconnectObjects()