summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2013-04-18 19:19:30 +0200
committerAndrea Diamantini <adjam7@gmail.com>2013-04-18 19:21:25 +0200
commit7fead72ed9d107d5e59564320fe9984e1a952b96 (patch)
treea63227e015a2e8e3f80c52d289d5316f57fa46c4
parentMake it build with QT_STRICT_ITERATORS (diff)
downloadrekonq-7fead72ed9d107d5e59564320fe9984e1a952b96.tar.xz
Add support for TLSv1.1 & TLSv1.2
Also consider the possibility our sslinfo can be "incomplete" ;) BUG: 318550
-rw-r--r--src/urlbar/sslwidget.cpp12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/urlbar/sslwidget.cpp b/src/urlbar/sslwidget.cpp
index 8e336219..59161267 100644
--- a/src/urlbar/sslwidget.cpp
+++ b/src/urlbar/sslwidget.cpp
@@ -167,6 +167,16 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
sslVersion = QL1S("TLS 1.0");
imageLabel->setPixmap(KIcon("security-high").pixmap(c_dim));
}
+ else if (vers == QL1S("TLSv1.1"))
+ {
+ sslVersion = QL1S("TLS 1.1");
+ imageLabel->setPixmap(KIcon("security-high").pixmap(c_dim));
+ }
+ else if (vers == QL1S("TLSv1.2"))
+ {
+ sslVersion = QL1S("TLS 1.2");
+ imageLabel->setPixmap(KIcon("security-high").pixmap(c_dim));
+ }
else
{
sslVersion = i18n("Unknown");
@@ -178,7 +188,7 @@ SSLWidget::SSLWidget(const QUrl &url, const WebSslInfo &info, QWidget *parent)
label->setText(i18n("It uses protocol: %1.\n", sslVersion));
layout->addWidget(label, rows++, 1);
- const QStringList cipherInfo = m_info.ciphers().split('\n', QString::SkipEmptyParts);
+ const QStringList cipherInfo = m_info.ciphers().split('\n', QString::KeepEmptyParts);
label = new QLabel(this);
label->setWordWrap(true);
label->setText(