mirror of
https://invent.kde.org/network/falkon.git
synced 2024-11-11 01:22:10 +01:00
NetworkManager: Use certificates from bundle only on Windows.
On other platforms, let's just use system certificates.
This commit is contained in:
parent
304f1704d2
commit
f32ec93caf
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
|
Loading…
Reference in New Issue
Block a user