X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fsslinfodlg.cpp;h=a549d8fc76ecbf147793de6180e2adf5ab67a887;hp=6fbf1103cc866cf65514cb164d9cc467c92e7fe6;hb=00e1a9c29e792ba4d65dba21b7ba04131bcb13bc;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b diff --git a/src/qtui/sslinfodlg.cpp b/src/qtui/sslinfodlg.cpp index 6fbf1103..a549d8fc 100644 --- a/src/qtui/sslinfodlg.cpp +++ b/src/qtui/sslinfodlg.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -80,25 +80,18 @@ 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))); + ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256))); } // 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 }