8316:0c7a44af84bc | 8318:962bce857696 |
---|---|
9 | 9 |
10 import contextlib | 10 import contextlib |
11 import enum | 11 import enum |
12 import platform | 12 import platform |
13 | 13 |
14 from PyQt5.QtCore import QObject, QByteArray | 14 from PyQt6.QtCore import QObject, QByteArray |
15 from PyQt5.QtNetwork import ( | 15 from PyQt6.QtNetwork import QSslCertificate, QSslConfiguration, QSslError, QSsl |
16 QSslCertificate, QSslConfiguration, QSslSocket, QSslError, QSsl | |
17 ) | |
18 | 16 |
19 from E5Gui import E5MessageBox | 17 from E5Gui import E5MessageBox |
20 | 18 |
21 import Preferences | 19 import Preferences |
22 import Utilities | 20 import Utilities |
269 @return list of system certificates (list of QSslCertificate) | 267 @return list of system certificates (list of QSslCertificate) |
270 """ | 268 """ |
271 caList = QSslCertificate.fromData(Globals.toByteArray( | 269 caList = QSslCertificate.fromData(Globals.toByteArray( |
272 Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) | 270 Preferences.Prefs.settings.value("Ssl/SystemCertificates"))) |
273 if not caList: | 271 if not caList: |
274 caList = QSslSocket.systemCaCertificates() | 272 caList = QSslConfiguration.systemCaCertificates() |
275 return caList | 273 return caList |