X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsslinfodlg.cpp;h=88ac6b1d9c8f7f4f4ffa6a3dfe9fe8b3ec536aaf;hp=e0b6a4924cd1275d7c81a2406d5bcbf931c4edb4;hb=3f1557375b65ba1f41b63d7d71fd177bd5e438b2;hpb=9fc57dc2c000e80fb8bd746a090e2e8210e1278e

diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp
index e0b6a492..88ac6b1d 100644
--- a/src/qtui/sslinfodlg.cpp
+++ b/src/qtui/sslinfodlg.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -45,7 +45,7 @@ SslInfoDlg::SslInfoDlg(const QSslSocket *socket, QWidget *parent)
 
     connect(ui.certificateChain, SIGNAL(currentIndexChanged(int)), SLOT(setCurrentCert(int)));
     foreach(const QSslCertificate &cert, socket->peerCertificateChain()) {
-        ui.certificateChain->addItem(cert.subjectInfo(QSslCertificate::CommonName));
+        ui.certificateChain->addItem(subjectInfo(cert, QSslCertificate::CommonName));
     }
 }
 
@@ -53,19 +53,19 @@ SslInfoDlg::SslInfoDlg(const QSslSocket *socket, QWidget *parent)
 void SslInfoDlg::setCurrentCert(int index)
 {
     QSslCertificate cert = socket()->peerCertificateChain().at(index);
-    ui.subjectCommonName->setText(cert.subjectInfo(QSslCertificate::CommonName));
-    ui.subjectOrganization->setText(cert.subjectInfo(QSslCertificate::Organization));
-    ui.subjectOrganizationalUnit->setText(cert.subjectInfo(QSslCertificate::OrganizationalUnitName));
-    ui.subjectCountry->setText(cert.subjectInfo(QSslCertificate::CountryName));
-    ui.subjectState->setText(cert.subjectInfo(QSslCertificate::StateOrProvinceName));
-    ui.subjectCity->setText(cert.subjectInfo(QSslCertificate::LocalityName));
+    ui.subjectCommonName->setText(subjectInfo(cert, QSslCertificate::CommonName));
+    ui.subjectOrganization->setText(subjectInfo(cert, QSslCertificate::Organization));
+    ui.subjectOrganizationalUnit->setText(subjectInfo(cert, QSslCertificate::OrganizationalUnitName));
+    ui.subjectCountry->setText(subjectInfo(cert, QSslCertificate::CountryName));
+    ui.subjectState->setText(subjectInfo(cert, QSslCertificate::StateOrProvinceName));
+    ui.subjectCity->setText(subjectInfo(cert, QSslCertificate::LocalityName));
 
-    ui.issuerCommonName->setText(cert.issuerInfo(QSslCertificate::CommonName));
-    ui.issuerOrganization->setText(cert.issuerInfo(QSslCertificate::Organization));
-    ui.issuerOrganizationalUnit->setText(cert.issuerInfo(QSslCertificate::OrganizationalUnitName));
-    ui.issuerCountry->setText(cert.issuerInfo(QSslCertificate::CountryName));
-    ui.issuerState->setText(cert.issuerInfo(QSslCertificate::StateOrProvinceName));
-    ui.issuerCity->setText(cert.issuerInfo(QSslCertificate::LocalityName));
+    ui.issuerCommonName->setText(issuerInfo(cert, QSslCertificate::CommonName));
+    ui.issuerOrganization->setText(issuerInfo(cert, QSslCertificate::Organization));
+    ui.issuerOrganizationalUnit->setText(issuerInfo(cert, QSslCertificate::OrganizationalUnitName));
+    ui.issuerCountry->setText(issuerInfo(cert, QSslCertificate::CountryName));
+    ui.issuerState->setText(issuerInfo(cert, QSslCertificate::StateOrProvinceName));
+    ui.issuerCity->setText(issuerInfo(cert, QSslCertificate::LocalityName));
 
     if (socket()->sslErrors().isEmpty())
         ui.trusted->setText(tr("Yes"));
@@ -81,3 +81,24 @@ void SslInfoDlg::setCurrentCert(int index)
     ui.md5Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Md5)));
     ui.sha1Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha1)));
 }
+
+// in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead
+QString SslInfoDlg::subjectInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const
+{
+#if QT_VERSION < 0x050000
+    return cert.subjectInfo(subjectInfo);
+#else
+    return cert.subjectInfo(subjectInfo).join(", ");
+#endif
+}
+
+
+// same here
+QString SslInfoDlg::issuerInfo(const QSslCertificate &cert, QSslCertificate::SubjectInfo subjectInfo) const
+{
+#if QT_VERSION < 0x050000
+    return cert.issuerInfo(subjectInfo);
+#else
+    return cert.issuerInfo(subjectInfo).join(", ");
+#endif
+}