diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-03-29 07:24:55 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-03-29 07:24:55 +0000 |
| commit | 798ae59d0de4b73754fa664f4f660c5d1074a646 (patch) | |
| tree | 9693f82d40e8d3db95c4a44aa019e48729b45230 /net/qt4-network | |
| parent | 12307c963b92a576dc1be6cb330d932e0a5b48f9 (diff) | |
| download | ports-798ae59d0de4b73754fa664f4f660c5d1074a646.tar.gz ports-798ae59d0de4b73754fa664f4f660c5d1074a646.zip | |
Notes
Diffstat (limited to 'net/qt4-network')
| -rw-r--r-- | net/qt4-network/Makefile | 1 | ||||
| -rw-r--r-- | net/qt4-network/files/patch-qsslsocket | 35 |
2 files changed, 36 insertions, 0 deletions
diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 083e3bad88f9..ac3d2433c4eb 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -8,6 +8,7 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES?= net ipv6 PKGNAMEPREFIX= qt4- diff --git a/net/qt4-network/files/patch-qsslsocket b/net/qt4-network/files/patch-qsslsocket new file mode 100644 index 000000000000..392613e40749 --- /dev/null +++ b/net/qt4-network/files/patch-qsslsocket @@ -0,0 +1,35 @@ +From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001 +From: Peter Hartmann <peter.hartmann@nokia.com> +Date: Fri, 25 Mar 2011 13:45:24 +0100 +Subject: [PATCH] QSslSocket internals: abort on encountering blacklisted certificates + +tested manually with "openssl s_server -cert blacklisted.pem -key +key.pem" and connecting a QSslSocket. + +Reviewed-by: Markus Goetz +Task-number: QTBUG-18338 +--- + src/network/ssl/qsslsocket_openssl.cpp | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index 0866534..2427193 100644 +--- ./src/network/ssl/qsslsocket_openssl.cpp ++++ ./src/network/ssl/qsslsocket_openssl.cpp +@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake() + X509 *x509 = q_SSL_get_peer_certificate(ssl); + configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509); + q_X509_free(x509); ++ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) { ++ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); ++ q->setSocketError(QAbstractSocket::SslHandshakeFailedError); ++ emit q->error(QAbstractSocket::SslHandshakeFailedError); ++ plainSocket->disconnectFromHost(); ++ return false; ++ } + + // Start translating errors. + QList<QSslError> errors; +-- +1.6.1 + |