From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 22 Nov 2015 22:26:28 +0000 (+0100)
Subject: Merge pull request #156 from veeti/sha256-certificate
X-Git-Tag: travis-deploy-test~541
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7df097437df5c77a1fd772ff1a5b63d40d09ac4f;hp=1b09aae7fe4eb3b560f87d3b1c1698e6bc91257b

Merge pull request #156 from veeti/sha256-certificate

Display SHA256 fingerprint for SSL certificates
---

diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp
index 6fbf1103..d3069df1 100644
--- a/src/qtui/sslinfodlg.cpp
+++ b/src/qtui/sslinfodlg.cpp
@@ -80,6 +80,13 @@ void SslInfoDlg::setCurrentCert(int index)
     ui.validity->setText(tr("%1 to %2").arg(cert.effectiveDate().date().toString(Qt::ISODate), cert.expiryDate().date().toString(Qt::ISODate)));
     ui.md5Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Md5)));
     ui.sha1Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha1)));
+#if QT_VERSION < 0x050000
+    // Qt 4 doesn't include SHA-2 hashes, so hide the row
+    ui.sha256Label->hide();
+    ui.sha256Digest->hide();
+#else
+    ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256)));
+#endif
 }
 
 // in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead
diff --git a/src/qtui/ui/sslinfodlg.ui b/src/qtui/ui/sslinfodlg.ui
index a52580b3..f623f6d8 100644
--- a/src/qtui/ui/sslinfodlg.ui
+++ b/src/qtui/ui/sslinfodlg.ui
@@ -412,6 +412,23 @@
        </property>
       </widget>
      </item>
+     <item row="10" column="0">
+      <widget class="QLabel" name="sha256Label">
+       <property name="text">
+        <string>&lt;b&gt;SHA256 digest:&lt;/b&gt;</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="1">
+      <widget class="QLabel" name="sha256Digest">
+       <property name="text">
+        <string notr="true">n/a</string>
+       </property>
+      </widget>
+     </item>
      <item row="4" column="2" colspan="2">
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
@@ -425,7 +442,7 @@
        </property>
       </spacer>
      </item>
-     <item row="10" column="0">
+     <item row="11" column="0">
       <widget class="QLabel" name="label_19">
        <property name="text">
         <string>&lt;b&gt;Trusted:&lt;/b&gt;</string>
@@ -435,7 +452,7 @@
        </property>
       </widget>
      </item>
-     <item row="10" column="1">
+     <item row="11" column="1">
       <widget class="QLabel" name="trusted">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Preferred" vsizetype="Maximum">