Mercurial Repositories > eric / file diff

--- a/E5Network/E5SslInfoWidget.py	Sat Sep 06 14:21:20 2014 +0200
+++ b/E5Network/E5SslInfoWidget.py	Sun Sep 07 19:55:43 2014 +0200
@@ -139,8 +139,8 @@
                 sslVersion = "SSL 3.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32.png"))
-            elif proto == QSsl.TlsV1:
-                sslVersion = "TLS 1.0"
+            elif proto == QSsl.TlsV1SslV3:
+                sslVersion = "TLS 1.0/SSL 3.0"
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityHigh32.png"))
             elif proto == QSsl.SslV2:
@@ -151,6 +151,24 @@
                 sslVersion = self.tr("unknown")
                 imageLabel.setPixmap(
                     UI.PixmapCache.getPixmap("securityLow32.png"))
+            if qVersion() >= "5.0.0":
+                if proto == QSsl.TlsV1_0:
+                    sslVersion = "TLS 1.0"
+                    imageLabel.setPixmap(
+                        UI.PixmapCache.getPixmap("securityHigh32.png"))
+                elif proto == QSsl.TlsV1_1:
+                    sslVersion = "TLS 1.1"
+                    imageLabel.setPixmap(
+                        UI.PixmapCache.getPixmap("securityHigh32.png"))
+                elif proto == QSsl.TlsV1_2:
+                    sslVersion = "TLS 1.2"
+                    imageLabel.setPixmap(
+                        UI.PixmapCache.getPixmap("securityHigh32.png"))
+            else:
+                if proto == QSsl.TlsV1:
+                    sslVersion = "TLS 1.0"
+                    imageLabel.setPixmap(
+                        UI.PixmapCache.getPixmap("securityHigh32.png"))
             rows += 1
             
             label = QLabel(self)