Mercurial Repositories > eric / file comparison
comparison: E5Network/E5SslErrorHandler.py
E5Network/E5SslErrorHandler.py
- changeset 6607
- 5237edb40b88
- parent 6048
- 82ad8ec9548c
- child 6613
- 7b7523fd4c80
equal
deleted
inserted
replaced
| 6606:593488c37f2c | 6607:5237edb40b88 |
|---|---|
| 55 for cert in QSslCertificate.fromData(certificateDict[server]): | 55 for cert in QSslCertificate.fromData(certificateDict[server]): |
| 56 if cert not in caList: | 56 if cert not in caList: |
| 57 caList.append(cert) | 57 caList.append(cert) |
| 58 sslCfg = QSslConfiguration.defaultConfiguration() | 58 sslCfg = QSslConfiguration.defaultConfiguration() |
| 59 sslCfg.setCaCertificates(caList) | 59 sslCfg.setCaCertificates(caList) |
| 60 sslCfg.setProtocol(QSsl.AnyProtocol) | 60 try: |
| 61 sslCfg.setProtocol(QSsl.TlsV1_1OrLater) | |
| 62 except AttributeError: | |
| 63 sslCfg.setProtocol(QSsl.SecureProtocols) | |
| 61 try: | 64 try: |
| 62 sslCfg.setSslOption(QSsl.SslOptionDisableCompression, True) | 65 sslCfg.setSslOption(QSsl.SslOptionDisableCompression, True) |
| 63 except AttributeError: | 66 except AttributeError: |
| 64 pass | 67 pass |
| 65 QSslConfiguration.setDefaultConfiguration(sslCfg) | 68 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 164 sslCfg = QSslConfiguration.defaultConfiguration() | 167 sslCfg = QSslConfiguration.defaultConfiguration() |
| 165 caList = sslCfg.caCertificates() | 168 caList = sslCfg.caCertificates() |
| 166 for cert in caNew: | 169 for cert in caNew: |
| 167 caList.append(cert) | 170 caList.append(cert) |
| 168 sslCfg.setCaCertificates(caList) | 171 sslCfg.setCaCertificates(caList) |
| 169 sslCfg.setProtocol(QSsl.AnyProtocol) | 172 try: |
| 173 sslCfg.setProtocol(QSsl.TlsV1_1OrLater) | |
| 174 except AttributeError: | |
| 175 sslCfg.setProtocol(QSsl.SecureProtocols) | |
| 176 try: | |
| 177 sslCfg.setSslOption(QSsl.SslOptionDisableCompression, | |
| 178 True) | |
| 179 except AttributeError: | |
| 180 pass | |
| 170 QSslConfiguration.setDefaultConfiguration(sslCfg) | 181 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 171 | 182 |
| 172 certificateDict = {} | 183 certificateDict = {} |
| 173 for server in caMerge: | 184 for server in caMerge: |
| 174 pems = QByteArray() | 185 pems = QByteArray() |
