Mercurial Repositories > eric / file comparison
comparison: eric6/E5Network/E5SslErrorHandler.py
eric6/E5Network/E5SslErrorHandler.py
- changeset 8143
- 2c730d5fd177
- parent 7923
- 91e843545d9a
- child 8176
- 31965986ecd1
- child 8218
- 7c09585bd960
equal
deleted
inserted
replaced
| 8141:27f636beebad | 8143:2c730d5fd177 |
|---|---|
| 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 try: | 60 try: |
| 61 sslProtocol = QSsl.TlsV1_1OrLater | 61 sslProtocol = QSsl.SslProtocol.TlsV1_1OrLater |
| 62 if Globals.isWindowsPlatform() and platform.win32_ver()[0] == '7': | 62 if Globals.isWindowsPlatform() and platform.win32_ver()[0] == '7': |
| 63 sslProtocol = QSsl.SecureProtocols | 63 sslProtocol = QSsl.SslProtocol.SecureProtocols |
| 64 except AttributeError: | 64 except AttributeError: |
| 65 sslProtocol = QSsl.SecureProtocols | 65 sslProtocol = QSsl.SslProtocol.SecureProtocols |
| 66 sslCfg.setProtocol(sslProtocol) | 66 sslCfg.setProtocol(sslProtocol) |
| 67 try: | 67 try: |
| 68 sslCfg.setSslOption(QSsl.SslOptionDisableCompression, True) | 68 sslCfg.setSslOption(QSsl.SslOption.SslOptionDisableCompression, |
| 69 True) | |
| 69 except AttributeError: | 70 except AttributeError: |
| 70 pass | 71 pass |
| 71 QSslConfiguration.setDefaultConfiguration(sslCfg) | 72 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 72 | 73 |
| 73 def sslErrorsReplySlot(self, reply, errors): | 74 def sslErrorsReplySlot(self, reply, errors): |
| 123 errorStrings = [] | 124 errorStrings = [] |
| 124 if port != -1: | 125 if port != -1: |
| 125 server += ":{0:d}".format(port) | 126 server += ":{0:d}".format(port) |
| 126 if errors: | 127 if errors: |
| 127 for err in errors: | 128 for err in errors: |
| 128 if err.error() == QSslError.NoError: | 129 if err.error() == QSslError.SslError.NoError: |
| 129 continue | 130 continue |
| 130 if server in caMerge and err.certificate() in caMerge[server]: | 131 if server in caMerge and err.certificate() in caMerge[server]: |
| 131 continue | 132 continue |
| 132 errorStrings.append(err.errorString()) | 133 errorStrings.append(err.errorString()) |
| 133 if not err.certificate().isNull(): | 134 if not err.certificate().isNull(): |
| 171 caList = sslCfg.caCertificates() | 172 caList = sslCfg.caCertificates() |
| 172 for cert in caNew: | 173 for cert in caNew: |
| 173 caList.append(cert) | 174 caList.append(cert) |
| 174 sslCfg.setCaCertificates(caList) | 175 sslCfg.setCaCertificates(caList) |
| 175 try: | 176 try: |
| 176 sslCfg.setProtocol(QSsl.TlsV1_1OrLater) | 177 sslCfg.setProtocol(QSsl.SslProtocol.TlsV1_1OrLater) |
| 177 except AttributeError: | 178 except AttributeError: |
| 178 sslCfg.setProtocol(QSsl.SecureProtocols) | 179 sslCfg.setProtocol(QSsl.SslProtocol.SecureProtocols) |
| 179 try: | 180 try: |
| 180 sslCfg.setSslOption(QSsl.SslOptionDisableCompression, | 181 sslCfg.setSslOption( |
| 181 True) | 182 QSsl.SslOption.SslOptionDisableCompression, |
| 183 True) | |
| 182 except AttributeError: | 184 except AttributeError: |
| 183 pass | 185 pass |
| 184 QSslConfiguration.setDefaultConfiguration(sslCfg) | 186 QSslConfiguration.setDefaultConfiguration(sslCfg) |
| 185 | 187 |
| 186 certificateDict = {} | 188 certificateDict = {} |
| 210 result += self.tr( | 212 result += self.tr( |
| 211 "Name: {0}" | 213 "Name: {0}" |
| 212 ).format( | 214 ).format( |
| 213 Utilities.html_encode( | 215 Utilities.html_encode( |
| 214 Utilities.decodeString( | 216 Utilities.decodeString( |
| 215 ", ".join(cert.subjectInfo(QSslCertificate.CommonName)) | 217 ", ".join(cert.subjectInfo( |
| 218 QSslCertificate.SubjectInfo.CommonName)) | |
| 216 ) | 219 ) |
| 217 ) | 220 ) |
| 218 ) | 221 ) |
| 219 | 222 |
| 220 result += self.tr( | 223 result += self.tr( |
| 221 "<br/>Organization: {0}" | 224 "<br/>Organization: {0}" |
| 222 ).format( | 225 ).format( |
| 223 Utilities.html_encode( | 226 Utilities.html_encode( |
| 224 Utilities.decodeString( | 227 Utilities.decodeString( |
| 225 ", ".join(cert.subjectInfo(QSslCertificate.Organization)) | 228 ", ".join(cert.subjectInfo( |
| 229 QSslCertificate.SubjectInfo.Organization)) | |
| 226 ) | 230 ) |
| 227 ) | 231 ) |
| 228 ) | 232 ) |
| 229 | 233 |
| 230 result += self.tr( | 234 result += self.tr( |
| 231 "<br/>Issuer: {0}" | 235 "<br/>Issuer: {0}" |
| 232 ).format( | 236 ).format( |
| 233 Utilities.html_encode( | 237 Utilities.html_encode( |
| 234 Utilities.decodeString( | 238 Utilities.decodeString( |
| 235 ", ".join(cert.issuerInfo(QSslCertificate.CommonName)) | 239 ", ".join(cert.issuerInfo( |
| 240 QSslCertificate.SubjectInfo.CommonName)) | |
| 236 ) | 241 ) |
| 237 ) | 242 ) |
| 238 ) | 243 ) |
| 239 result += self.tr( | 244 result += self.tr( |
| 240 "<br/>Not valid before: {0}<br/>Valid Until: {1}" | 245 "<br/>Not valid before: {0}<br/>Valid Until: {1}" |
