diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-04-13 20:45:45 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-04-13 23:03:43 +0200 |
| commit | 3bced54404eef0203250cf9b4b5fa9a1e3d05d85 (patch) | |
| tree | ca165af2bea8f48cf5caccf2cdd388c63efd3a93 | |
| parent | ca4d25b203ecb946106f6c4f4878f4c9fa16d46c (diff) | |
| download | qutebrowser-3bced54404eef0203250cf9b4b5fa9a1e3d05d85.tar.gz qutebrowser-3bced54404eef0203250cf9b4b5fa9a1e3d05d85.zip | |
Switch to new API for SSL ciphers
This got moved to QSslConfiguration in Qt 5.5:
https://codereview.qt-project.org/c/qt/qtbase/+/113886
(92cda9474245c79b635c21cd140c5d0a3a6d2e5b in qtbase)
(cherry picked from commit 317da1e3cf23bf40d24d186cd6d06b6bc9a09958)
| -rw-r--r-- | qutebrowser/browser/webkit/network/networkmanager.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qutebrowser/browser/webkit/network/networkmanager.py b/qutebrowser/browser/webkit/network/networkmanager.py index 17f4736b8..4511a973c 100644 --- a/qutebrowser/browser/webkit/network/networkmanager.py +++ b/qutebrowser/browser/webkit/network/networkmanager.py @@ -25,7 +25,7 @@ import dataclasses from typing import TYPE_CHECKING, Dict, MutableMapping, Optional, Set from PyQt5.QtCore import pyqtSlot, pyqtSignal, QUrl, QByteArray -from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslSocket, +from PyQt5.QtNetwork import (QNetworkAccessManager, QNetworkReply, QSslConfiguration, QNetworkProxy) from qutebrowser.config import config @@ -103,7 +103,8 @@ def _is_secure_cipher(cipher): def init(): """Disable insecure SSL ciphers on old Qt versions.""" - default_ciphers = QSslSocket.defaultCiphers() + config = QSslConfiguration.defaultConfiguration() + default_ciphers = config.ciphers() log.init.vdebug( # type: ignore[attr-defined] "Default Qt ciphers: {}".format( ', '.join(c.name() for c in default_ciphers))) @@ -119,7 +120,7 @@ def init(): if bad_ciphers: log.init.debug("Disabling bad ciphers: {}".format( ', '.join(c.name() for c in bad_ciphers))) - QSslSocket.setDefaultCiphers(good_ciphers) + config.setCiphers(good_ciphers) _SavedErrorsType = MutableMapping[ |