projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix parents for all dialog windows
[quassel.git]
/
src
/
qtui
/
sslinfodlg.cpp
diff --git
a/src/qtui/sslinfodlg.cpp
b/src/qtui/sslinfodlg.cpp
index
d3069df
..
67f0dd5
100644
(file)
--- a/
src/qtui/sslinfodlg.cpp
+++ b/
src/qtui/sslinfodlg.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
15
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-18,21
+18,22
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
+#include "sslinfodlg.h"
+
#include <QDateTime>
#include <QHostAddress>
#include <QSslCipher>
#include <QSslSocket>
#include <QDateTime>
#include <QHostAddress>
#include <QSslCipher>
#include <QSslSocket>
-#include "sslinfodlg.h"
#include "util.h"
// ========================================
// SslInfoDlg
// ========================================
#include "util.h"
// ========================================
// SslInfoDlg
// ========================================
-SslInfoDlg::SslInfoDlg(const QSslSocket
*socket, QWidget *
parent)
- : QDialog(parent)
,
- _socket(socket)
+SslInfoDlg::SslInfoDlg(const QSslSocket
* socket, QWidget*
parent)
+ : QDialog(parent)
+
,
_socket(socket)
{
ui.setupUi(this);
{
ui.setupUi(this);
@@
-43,13
+44,12
@@
SslInfoDlg::SslInfoDlg(const QSslSocket *socket, QWidget *parent)
ui.encryption->setText(cipher.name());
ui.protocol->setText(cipher.protocolString());
ui.encryption->setText(cipher.name());
ui.protocol->setText(cipher.protocolString());
- connect(ui.certificateChain,
SIGNAL(currentIndexChanged(int)), SLOT(setCurrentCert(int))
);
- foreach
(const QSslCertificate &
cert, socket->peerCertificateChain()) {
+ connect(ui.certificateChain,
selectOverload<int>(&QComboBox::currentIndexChanged), this, &SslInfoDlg::setCurrentCert
);
+ foreach
(const QSslCertificate&
cert, socket->peerCertificateChain()) {
ui.certificateChain->addItem(subjectInfo(cert, QSslCertificate::CommonName));
}
}
ui.certificateChain->addItem(subjectInfo(cert, QSslCertificate::CommonName));
}
}
-
void SslInfoDlg::setCurrentCert(int index)
{
QSslCertificate cert = socket()->peerCertificateChain().at(index);
void SslInfoDlg::setCurrentCert(int index)
{
QSslCertificate cert = socket()->peerCertificateChain().at(index);
@@
-67,45
+67,38
@@
void SslInfoDlg::setCurrentCert(int index)
ui.issuerState->setText(issuerInfo(cert, QSslCertificate::StateOrProvinceName));
ui.issuerCity->setText(issuerInfo(cert, QSslCertificate::LocalityName));
ui.issuerState->setText(issuerInfo(cert, QSslCertificate::StateOrProvinceName));
ui.issuerCity->setText(issuerInfo(cert, QSslCertificate::LocalityName));
- if (socket()->sslErrors().isEmpty())
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+ const auto& sslErrors = socket()->sslErrors();
+#else
+ const auto& sslErrors = socket()->sslHandshakeErrors();
+#endif
+ if (sslErrors.isEmpty()) {
ui.trusted->setText(tr("Yes"));
ui.trusted->setText(tr("Yes"));
+ }
else {
QString errorString = tr("No, for the following reasons:<ul>");
else {
QString errorString = tr("No, for the following reasons:<ul>");
- foreach(const QSslError &error, socket()->sslErrors())
- errorString += "<li>" + error.errorString() + "</li>";
+ for (const auto& error : sslErrors) {
+ errorString += "<li>" + error.errorString() + "</li>";
+ }
errorString += "</ul>";
ui.trusted->setText(errorString);
}
errorString += "</ul>";
ui.trusted->setText(errorString);
}
- ui.validity->setText(tr("%1 to %2").arg(cert.effectiveDate().date().toString(Qt::ISODate), cert.expiryDate().date().toString(Qt::ISODate)));
+ 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.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)));
ui.sha256Digest->setText(prettyDigest(cert.digest(QCryptographicHash::Sha256)));
-#endif
}
// in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead
}
// in Qt5, subjectInfo returns a QStringList(); turn this into a comma-separated string instead
-QString SslInfoDlg::subjectInfo(const QSslCertificate
&
cert, QSslCertificate::SubjectInfo subjectInfo) const
+QString SslInfoDlg::subjectInfo(const QSslCertificate
&
cert, QSslCertificate::SubjectInfo subjectInfo) const
{
{
-#if QT_VERSION < 0x050000
- return cert.subjectInfo(subjectInfo);
-#else
return cert.subjectInfo(subjectInfo).join(", ");
return cert.subjectInfo(subjectInfo).join(", ");
-#endif
}
}
-
// same here
// same here
-QString SslInfoDlg::issuerInfo(const QSslCertificate
&
cert, QSslCertificate::SubjectInfo subjectInfo) const
+QString SslInfoDlg::issuerInfo(const QSslCertificate
&
cert, QSslCertificate::SubjectInfo subjectInfo) const
{
{
-#if QT_VERSION < 0x050000
- return cert.issuerInfo(subjectInfo);
-#else
return cert.issuerInfo(subjectInfo).join(", ");
return cert.issuerInfo(subjectInfo).join(", ");
-#endif
}
}