From 749a63c1f90d0b5363437370bd7ef6d4a3a06cf8 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Fri, 25 Mar 2011 12:09:53 +0100 Subject: [PATCH] apply patch to fix QTBUG-18338, blacklist fraudulent SSL certifcates --- qt-ssl-QTBUG-18338.patch | 84 ++++++++++++++++++++++++++++++++++++++++ qt.spec | 7 +++- 2 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 qt-ssl-QTBUG-18338.patch diff --git a/qt-ssl-QTBUG-18338.patch b/qt-ssl-QTBUG-18338.patch new file mode 100644 index 0000000..0ed3b31 --- /dev/null +++ b/qt-ssl-QTBUG-18338.patch @@ -0,0 +1,84 @@ +From 04e074e8d7c097295505e63565abdc7ca2b49f7b Mon Sep 17 00:00:00 2001 +From: Peter Hartmann +Date: Thu, 24 Mar 2011 14:42:22 +0100 +Subject: [PATCH] QSslCertificate: report fraudulent certificates as invalid + +There are some fraudulent certificates in the wild that are not valid; +this patch introduces a blacklist of serial numbers of those +certificates. + +Reviewed-by: Richard J. Moore +Reviewed-by: Markus Goetz +Task-number: QTBUG-18338 + +diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp +index 618ac79..a5cdf01 100644 +--- a/src/network/ssl/qsslcertificate.cpp ++++ b/src/network/ssl/qsslcertificate.cpp +@@ -219,17 +219,19 @@ bool QSslCertificate::isNull() const + Returns true if this certificate is valid; otherwise returns + false. + +- Note: Currently, this function only checks that the current ++ Note: Currently, this function checks that the current + data-time is within the date-time range during which the +- certificate is considered valid. No other checks are +- currently performed. ++ certificate is considered valid, and checks that the ++ certificate is not in a blacklist of fraudulent certificates. + + \sa isNull() + */ + bool QSslCertificate::isValid() const + { + const QDateTime currentTime = QDateTime::currentDateTime(); +- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter; ++ return currentTime >= d->notValidBefore && ++ currentTime <= d->notValidAfter && ++ ! QSslCertificatePrivate::isBlacklisted(*this); + } + + /*! +@@ -798,6 +800,30 @@ QList QSslCertificatePrivate::certificatesFromDer(const QByteAr + return certificates; + } + ++// These certificates are known to be fraudulent and were created during the comodo ++// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html ++static const char *certificate_blacklist[] = { ++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", ++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", ++ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", ++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", ++ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", ++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", ++ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", ++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", ++ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", ++ 0 ++}; ++ ++bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate) ++{ ++ for (int a = 0; certificate_blacklist[a] != 0; a++) { ++ if (certificate.serialNumber() == certificate_blacklist[a]) ++ return true; ++ } ++ return false; ++} ++ + #ifndef QT_NO_DEBUG_STREAM + QDebug operator<<(QDebug debug, const QSslCertificate &certificate) + { +diff --git a/src/network/ssl/qsslcertificate_p.h b/src/network/ssl/qsslcertificate_p.h +index cdceb0f..1ce33d3 100644 +--- a/src/network/ssl/qsslcertificate_p.h ++++ b/src/network/ssl/qsslcertificate_p.h +@@ -96,6 +96,7 @@ public: + static QSslCertificate QSslCertificate_from_X509(X509 *x509); + static QList certificatesFromPem(const QByteArray &pem, int count = -1); + static QList certificatesFromDer(const QByteArray &der, int count = -1); ++ static bool isBlacklisted(const QSslCertificate &certificate); + + friend class QSslSocketBackendPrivate; + diff --git a/qt.spec b/qt.spec index 14b93c8..76814f9 100644 --- a/qt.spec +++ b/qt.spec @@ -18,7 +18,7 @@ Summary: Qt toolkit Name: qt Epoch: 1 Version: 4.7.2 -Release: 4%{?dist} +Release: 5%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: (LGPLv2 with exceptions or GPLv3 with exceptions) and ASL 2.0 and BSD and FTL and MIT @@ -105,6 +105,7 @@ Patch212: 0012-Add-context-to-tr-calls-in-QShortcut.patch # security patches Patch300: qt-everywhere-opensource-src-4.7.0-CVE-2010-1822-crash-svg-image.patch +Patch301: qt-ssl-QTBUG-18338.patch # gstreamer logos Source10: http://gstreamer.freedesktop.org/data/images/artwork/gstreamer-logo.svg @@ -511,6 +512,7 @@ Qt libraries used for drawing widgets and OpenGL items. # security fixes %patch300 -p1 -b .CVE-2010-1822-crash-svg-image +%patch301 -p1 -b .ssl-QTBUG-18338 # drop -fexceptions from $RPM_OPT_FLAGS RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed 's|-fexceptions||g'` @@ -1194,6 +1196,9 @@ fi %changelog +* Fri Mar 25 2011 Than Ngo - 1:4.7.2-5 +- apply patch to fix QTBUG-18338, blacklist fraudulent SSL certifcates + * Tue Mar 22 2011 Jaroslav Reznik 1:4.7.2-4 - rebuild (mysql)