head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.8 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.6 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.1.0.2 pkgsrc-2011Q1-base:1.1; locks; strict; comment @// @; 1.3 date 2011.05.05.12.38.40; author adam; state dead; branches; next 1.2; 1.2 date 2011.04.07.05.23.52; author obache; state Exp; branches; next 1.1; 1.1 date 2011.04.01.20.53.55; author markd; state Exp; branches; next ; desc @@ 1.3 log @Changes 4.7.3: QtNetwork - SSL * [QTBUG-18338] blacklist fraudulent SSL certificates Qt for Symbian - Bearer Management * [QTBUG-15108] Deadlock between SymbianEngine mutex and QNetworkConfigurationPrivate mutex in the symbian bearer code * [QTBUG-17627] qnetworksession.h Q_DECLARE_METATYPE breaks building QtMobility QtBearer depending applications - GraphicsView * [QTBUG-17966] Major regression in QGraphicsView OpenVG backend - Declarative * [QTBUG-17503] Export qml debugging symbols on Symbian - Widgets * [QTBUG-17786] BC between Qt 4.7.3 and 4.6.3 QTreeView::indexRowSizeHint doesn't return correct value on Symbian for row when QPushButton widget is inserted in the treeview * [QTBUG-4953] QMessageBox can not be closed/dismissed on touch phones if any widget is fullscreen - Painting * [QTBUG-17907] tst_QGraphicsTransform::rotation3d test case from tests/auto/qgraphicstransfor is failed for some rotation angle on Symbian^3 devices * [QTBUG-18154] Symbian's QPixmap::logicalDpi[X\Y]() incorrectly returns MAXINT @ text @$NetBSD: patch-src_network_ssl_qsslsocket_openssl.cpp,v 1.2 2011/04/07 05:23:52 obache Exp $ From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001 From: Peter Hartmann 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 errors; @ 1.2 log @Add RCS Id and remove redundant last part. regen and let to be formal distinfo format. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Add blacklist of fraudulent certificates. Patch from upstream. Bump PKGREVISION. @ text @d1 2 a34 3 -- 1.6.1 @