2011-04-27 10:05:43 +00:00
|
|
|
/****************************************************************************
|
|
|
|
**
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
** Copyright (C) 2017 The Qt Company Ltd.
|
2014-09-03 09:12:12 +00:00
|
|
|
** Copyright (C) 2014 Governikus GmbH & Co. KG
|
2016-01-15 07:08:27 +00:00
|
|
|
** Contact: https://www.qt.io/licensing/
|
2011-04-27 10:05:43 +00:00
|
|
|
**
|
|
|
|
** This file is part of the QtNetwork module of the Qt Toolkit.
|
|
|
|
**
|
2016-01-15 07:08:27 +00:00
|
|
|
** $QT_BEGIN_LICENSE:LGPL$
|
2012-09-19 12:28:29 +00:00
|
|
|
** Commercial License Usage
|
|
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
|
|
** accordance with the commercial license agreement provided with the
|
|
|
|
** Software or, alternatively, in accordance with the terms contained in
|
2015-01-28 08:44:43 +00:00
|
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
2016-01-15 07:08:27 +00:00
|
|
|
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
|
|
** information use the contact form at https://www.qt.io/contact-us.
|
2012-09-19 12:28:29 +00:00
|
|
|
**
|
2011-04-27 10:05:43 +00:00
|
|
|
** GNU Lesser General Public License Usage
|
2012-09-19 12:28:29 +00:00
|
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
2016-01-15 07:08:27 +00:00
|
|
|
** General Public License version 3 as published by the Free Software
|
|
|
|
** Foundation and appearing in the file LICENSE.LGPL3 included in the
|
|
|
|
** packaging of this file. Please review the following information to
|
|
|
|
** ensure the GNU Lesser General Public License version 3 requirements
|
|
|
|
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
|
|
|
**
|
|
|
|
** GNU General Public License Usage
|
|
|
|
** Alternatively, this file may be used under the terms of the GNU
|
|
|
|
** General Public License version 2.0 or (at your option) the GNU General
|
|
|
|
** Public license version 3 or any later version approved by the KDE Free
|
|
|
|
** Qt Foundation. The licenses are as published by the Free Software
|
|
|
|
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
|
|
|
** included in the packaging of this file. Please review the following
|
|
|
|
** information to ensure the GNU General Public License requirements will
|
|
|
|
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
|
|
|
** https://www.gnu.org/licenses/gpl-3.0.html.
|
2011-04-27 10:05:43 +00:00
|
|
|
**
|
|
|
|
** $QT_END_LICENSE$
|
|
|
|
**
|
|
|
|
****************************************************************************/
|
|
|
|
|
2013-02-05 18:22:11 +00:00
|
|
|
/****************************************************************************
|
|
|
|
**
|
|
|
|
** In addition, as a special exception, the copyright holders listed above give
|
|
|
|
** permission to link the code of its release of Qt with the OpenSSL project's
|
|
|
|
** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the
|
|
|
|
** same license as the original version), and distribute the linked executables.
|
|
|
|
**
|
|
|
|
** You must comply with the GNU General Public License version 2 in all
|
|
|
|
** respects for all of the code used other than the "OpenSSL" code. If you
|
|
|
|
** modify this file, you may extend this exception to your version of the file,
|
|
|
|
** but you are not obligated to do so. If you do not wish to do so, delete
|
|
|
|
** this exception statement from your version of this file.
|
|
|
|
**
|
|
|
|
****************************************************************************/
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
//#define QSSLSOCKET_DEBUG
|
|
|
|
|
2014-12-08 12:35:47 +00:00
|
|
|
#include "qssl_p.h"
|
2011-04-27 10:05:43 +00:00
|
|
|
#include "qsslsocket_openssl_p.h"
|
|
|
|
#include "qsslsocket_openssl_symbols_p.h"
|
|
|
|
#include "qsslsocket.h"
|
|
|
|
#include "qsslcertificate_p.h"
|
|
|
|
#include "qsslcipher_p.h"
|
2014-05-10 21:49:37 +00:00
|
|
|
#include "qsslkey_p.h"
|
2014-09-03 09:12:12 +00:00
|
|
|
#include "qsslellipticcurve.h"
|
2014-10-15 13:13:47 +00:00
|
|
|
#include "qsslpresharedkeyauthenticator.h"
|
|
|
|
#include "qsslpresharedkeyauthenticator_p.h"
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
#include <QtCore/qdatetime.h>
|
|
|
|
#include <QtCore/qdebug.h>
|
|
|
|
#include <QtCore/qdir.h>
|
|
|
|
#include <QtCore/qdiriterator.h>
|
|
|
|
#include <QtCore/qelapsedtimer.h>
|
|
|
|
#include <QtCore/qfile.h>
|
|
|
|
#include <QtCore/qfileinfo.h>
|
|
|
|
#include <QtCore/qmutex.h>
|
|
|
|
#include <QtCore/qthread.h>
|
|
|
|
#include <QtCore/qurl.h>
|
|
|
|
#include <QtCore/qvarlengtharray.h>
|
|
|
|
|
2014-10-15 13:13:47 +00:00
|
|
|
#include <string.h>
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
QT_BEGIN_NAMESPACE
|
|
|
|
|
2015-11-16 14:02:37 +00:00
|
|
|
#if defined(Q_OS_WIN)
|
2011-04-27 10:05:43 +00:00
|
|
|
PtrCertOpenSystemStoreW QSslSocketPrivate::ptrCertOpenSystemStoreW = 0;
|
|
|
|
PtrCertFindCertificateInStore QSslSocketPrivate::ptrCertFindCertificateInStore = 0;
|
|
|
|
PtrCertCloseStore QSslSocketPrivate::ptrCertCloseStore = 0;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
bool QSslSocketPrivate::s_libraryLoaded = false;
|
|
|
|
bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
|
|
|
|
bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
|
|
|
|
|
2014-10-15 13:13:47 +00:00
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
|
|
|
|
int QSslSocketBackendPrivate::s_indexForSSLExtraData = -1;
|
|
|
|
#endif
|
|
|
|
|
2012-12-21 13:02:38 +00:00
|
|
|
QString QSslSocketBackendPrivate::getErrorsFromOpenSsl()
|
|
|
|
{
|
|
|
|
QString errorString;
|
|
|
|
unsigned long errNum;
|
|
|
|
while ((errNum = q_ERR_get_error())) {
|
|
|
|
if (! errorString.isEmpty())
|
|
|
|
errorString.append(QLatin1String(", "));
|
|
|
|
const char *error = q_ERR_error_string(errNum, NULL);
|
|
|
|
errorString.append(QString::fromLatin1(error)); // error is ascii according to man ERR_error_string
|
|
|
|
}
|
|
|
|
return errorString;
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
extern "C" {
|
2014-10-15 13:13:47 +00:00
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK)
|
|
|
|
static unsigned int q_ssl_psk_client_callback(SSL *ssl,
|
|
|
|
const char *hint,
|
|
|
|
char *identity, unsigned int max_identity_len,
|
|
|
|
unsigned char *psk, unsigned int max_psk_len)
|
|
|
|
{
|
|
|
|
QSslSocketBackendPrivate *d = reinterpret_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(ssl, QSslSocketBackendPrivate::s_indexForSSLExtraData));
|
|
|
|
Q_ASSERT(d);
|
|
|
|
return d->tlsPskClientCallback(hint, identity, max_identity_len, psk, max_psk_len);
|
|
|
|
}
|
2016-03-23 11:27:11 +00:00
|
|
|
|
|
|
|
static unsigned int q_ssl_psk_server_callback(SSL *ssl,
|
|
|
|
const char *identity,
|
|
|
|
unsigned char *psk, unsigned int max_psk_len)
|
|
|
|
{
|
|
|
|
QSslSocketBackendPrivate *d = reinterpret_cast<QSslSocketBackendPrivate *>(q_SSL_get_ex_data(ssl, QSslSocketBackendPrivate::s_indexForSSLExtraData));
|
|
|
|
Q_ASSERT(d);
|
|
|
|
return d->tlsPskServerCallback(identity, psk, max_psk_len);
|
|
|
|
}
|
2014-10-15 13:13:47 +00:00
|
|
|
#endif
|
2011-04-27 10:05:43 +00:00
|
|
|
} // extern "C"
|
|
|
|
|
|
|
|
QSslSocketBackendPrivate::QSslSocketBackendPrivate()
|
|
|
|
: ssl(0),
|
|
|
|
readBio(0),
|
|
|
|
writeBio(0),
|
|
|
|
session(0)
|
|
|
|
{
|
|
|
|
// Calls SSL_library_init().
|
|
|
|
ensureInitialized();
|
|
|
|
}
|
|
|
|
|
|
|
|
QSslSocketBackendPrivate::~QSslSocketBackendPrivate()
|
|
|
|
{
|
2012-01-30 15:52:27 +00:00
|
|
|
destroySslContext();
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
QSslCipher QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(const SSL_CIPHER *cipher)
|
2011-04-27 10:05:43 +00:00
|
|
|
{
|
|
|
|
QSslCipher ciph;
|
|
|
|
|
|
|
|
char buf [256];
|
|
|
|
QString descriptionOneLine = QString::fromLatin1(q_SSL_CIPHER_description(cipher, buf, sizeof(buf)));
|
|
|
|
|
2016-03-30 11:23:12 +00:00
|
|
|
const auto descriptionList = descriptionOneLine.splitRef(QLatin1Char(' '), QString::SkipEmptyParts);
|
2011-04-27 10:05:43 +00:00
|
|
|
if (descriptionList.size() > 5) {
|
|
|
|
// ### crude code.
|
|
|
|
ciph.d->isNull = false;
|
2016-03-30 11:23:12 +00:00
|
|
|
ciph.d->name = descriptionList.at(0).toString();
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2016-03-30 11:23:12 +00:00
|
|
|
QString protoString = descriptionList.at(1).toString();
|
2011-04-27 10:05:43 +00:00
|
|
|
ciph.d->protocolString = protoString;
|
|
|
|
ciph.d->protocol = QSsl::UnknownProtocol;
|
|
|
|
if (protoString == QLatin1String("SSLv3"))
|
|
|
|
ciph.d->protocol = QSsl::SslV3;
|
|
|
|
else if (protoString == QLatin1String("SSLv2"))
|
|
|
|
ciph.d->protocol = QSsl::SslV2;
|
|
|
|
else if (protoString == QLatin1String("TLSv1"))
|
2011-11-14 11:33:55 +00:00
|
|
|
ciph.d->protocol = QSsl::TlsV1_0;
|
2012-08-16 23:14:04 +00:00
|
|
|
else if (protoString == QLatin1String("TLSv1.1"))
|
|
|
|
ciph.d->protocol = QSsl::TlsV1_1;
|
|
|
|
else if (protoString == QLatin1String("TLSv1.2"))
|
|
|
|
ciph.d->protocol = QSsl::TlsV1_2;
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
if (descriptionList.at(2).startsWith(QLatin1String("Kx=")))
|
2016-03-30 11:23:12 +00:00
|
|
|
ciph.d->keyExchangeMethod = descriptionList.at(2).mid(3).toString();
|
2011-04-27 10:05:43 +00:00
|
|
|
if (descriptionList.at(3).startsWith(QLatin1String("Au=")))
|
2016-03-30 11:23:12 +00:00
|
|
|
ciph.d->authenticationMethod = descriptionList.at(3).mid(3).toString();
|
2011-04-27 10:05:43 +00:00
|
|
|
if (descriptionList.at(4).startsWith(QLatin1String("Enc=")))
|
2016-03-30 11:23:12 +00:00
|
|
|
ciph.d->encryptionMethod = descriptionList.at(4).mid(4).toString();
|
2011-04-27 10:05:43 +00:00
|
|
|
ciph.d->exportable = (descriptionList.size() > 6 && descriptionList.at(6) == QLatin1String("export"));
|
|
|
|
|
2014-05-18 11:19:32 +00:00
|
|
|
ciph.d->bits = q_SSL_CIPHER_get_bits(cipher, &ciph.d->supportedBits);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
return ciph;
|
|
|
|
}
|
|
|
|
|
2016-01-17 13:16:43 +00:00
|
|
|
// static
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
inline QSslErrorEntry QSslErrorEntry::fromStoreContext(X509_STORE_CTX *ctx)
|
|
|
|
{
|
2017-04-19 23:43:33 +00:00
|
|
|
return {
|
2016-01-17 13:16:43 +00:00
|
|
|
q_X509_STORE_CTX_get_error(ctx),
|
|
|
|
q_X509_STORE_CTX_get_error_depth(ctx)
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
// ### This list is shared between all threads, and protected by a
|
|
|
|
// mutex. Investigate using thread local storage instead.
|
|
|
|
struct QSslErrorList
|
|
|
|
{
|
|
|
|
QMutex mutex;
|
2016-01-17 13:16:43 +00:00
|
|
|
QVector<QSslErrorEntry> errors;
|
2011-04-27 10:05:43 +00:00
|
|
|
};
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
Q_GLOBAL_STATIC(QSslErrorList, _q_sslErrorList)
|
2012-12-21 13:02:38 +00:00
|
|
|
|
|
|
|
int q_X509Callback(int ok, X509_STORE_CTX *ctx)
|
2011-04-27 10:05:43 +00:00
|
|
|
{
|
|
|
|
if (!ok) {
|
|
|
|
// Store the error and at which depth the error was detected.
|
2016-01-17 13:16:43 +00:00
|
|
|
_q_sslErrorList()->errors << QSslErrorEntry::fromStoreContext(ctx);
|
2017-09-13 13:10:06 +00:00
|
|
|
#if !QT_CONFIG(opensslv11)
|
2012-01-06 16:50:23 +00:00
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "verification error: dumping bad certificate";
|
|
|
|
qCDebug(lcSsl) << QSslCertificatePrivate::QSslCertificate_from_X509(q_X509_STORE_CTX_get_current_cert(ctx)).toPem();
|
|
|
|
qCDebug(lcSsl) << "dumping chain";
|
2016-01-26 13:38:54 +00:00
|
|
|
const auto certs = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(q_X509_STORE_CTX_get_chain(ctx));
|
|
|
|
for (const QSslCertificate &cert : certs) {
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "Issuer:" << "O=" << cert.issuerInfo(QSslCertificate::Organization)
|
2012-01-06 16:50:23 +00:00
|
|
|
<< "CN=" << cert.issuerInfo(QSslCertificate::CommonName)
|
|
|
|
<< "L=" << cert.issuerInfo(QSslCertificate::LocalityName)
|
|
|
|
<< "OU=" << cert.issuerInfo(QSslCertificate::OrganizationalUnitName)
|
|
|
|
<< "C=" << cert.issuerInfo(QSslCertificate::CountryName)
|
|
|
|
<< "ST=" << cert.issuerInfo(QSslCertificate::StateOrProvinceName);
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "Subject:" << "O=" << cert.subjectInfo(QSslCertificate::Organization)
|
2012-01-06 16:50:23 +00:00
|
|
|
<< "CN=" << cert.subjectInfo(QSslCertificate::CommonName)
|
|
|
|
<< "L=" << cert.subjectInfo(QSslCertificate::LocalityName)
|
|
|
|
<< "OU=" << cert.subjectInfo(QSslCertificate::OrganizationalUnitName)
|
|
|
|
<< "C=" << cert.subjectInfo(QSslCertificate::CountryName)
|
|
|
|
<< "ST=" << cert.subjectInfo(QSslCertificate::StateOrProvinceName);
|
2015-10-13 07:26:59 +00:00
|
|
|
qCDebug(lcSsl) << "Valid:" << cert.effectiveDate() << '-' << cert.expiryDate();
|
2012-01-06 16:50:23 +00:00
|
|
|
}
|
2017-09-13 13:10:06 +00:00
|
|
|
#endif // QSSLSOCKET_DEBUG
|
|
|
|
#endif // !QT_CONFIG(opensslv11)
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
// Always return OK to allow verification to continue. We handle the
|
2011-04-27 10:05:43 +00:00
|
|
|
// errors gracefully after collecting all errors, after verification has
|
|
|
|
// completed.
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2011-11-15 21:58:05 +00:00
|
|
|
long QSslSocketBackendPrivate::setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions)
|
|
|
|
{
|
|
|
|
long options;
|
2014-10-21 13:44:43 +00:00
|
|
|
if (protocol == QSsl::TlsV1SslV3)
|
2011-11-15 21:58:05 +00:00
|
|
|
options = SSL_OP_ALL|SSL_OP_NO_SSLv2;
|
2014-10-21 13:44:43 +00:00
|
|
|
else if (protocol == QSsl::SecureProtocols)
|
|
|
|
options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
|
2015-02-13 10:57:41 +00:00
|
|
|
else if (protocol == QSsl::TlsV1_0OrLater)
|
|
|
|
options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3;
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
|
|
|
|
// Choosing Tlsv1_1OrLater or TlsV1_2OrLater on OpenSSL < 1.0.1
|
|
|
|
// will cause an error in QSslContext::fromConfiguration, meaning
|
|
|
|
// we will never get here.
|
|
|
|
else if (protocol == QSsl::TlsV1_1OrLater)
|
|
|
|
options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1;
|
|
|
|
else if (protocol == QSsl::TlsV1_2OrLater)
|
|
|
|
options = SSL_OP_ALL|SSL_OP_NO_SSLv2|SSL_OP_NO_SSLv3|SSL_OP_NO_TLSv1|SSL_OP_NO_TLSv1_1;
|
|
|
|
#endif
|
2011-11-15 21:58:05 +00:00
|
|
|
else
|
|
|
|
options = SSL_OP_ALL;
|
|
|
|
|
|
|
|
// This option is disabled by default, so we need to be able to clear it
|
|
|
|
if (sslOptions & QSsl::SslOptionDisableEmptyFragments)
|
|
|
|
options |= SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
|
|
|
|
else
|
|
|
|
options &= ~SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS;
|
|
|
|
|
|
|
|
#ifdef SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION
|
|
|
|
// This option is disabled by default, so we need to be able to clear it
|
|
|
|
if (sslOptions & QSsl::SslOptionDisableLegacyRenegotiation)
|
|
|
|
options &= ~SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
|
|
|
|
else
|
|
|
|
options |= SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef SSL_OP_NO_TICKET
|
|
|
|
if (sslOptions & QSsl::SslOptionDisableSessionTickets)
|
|
|
|
options |= SSL_OP_NO_TICKET;
|
|
|
|
#endif
|
|
|
|
#ifdef SSL_OP_NO_COMPRESSION
|
|
|
|
if (sslOptions & QSsl::SslOptionDisableCompression)
|
|
|
|
options |= SSL_OP_NO_COMPRESSION;
|
|
|
|
#endif
|
|
|
|
|
2015-04-18 10:34:26 +00:00
|
|
|
if (!(sslOptions & QSsl::SslOptionDisableServerCipherPreference))
|
|
|
|
options |= SSL_OP_CIPHER_SERVER_PREFERENCE;
|
|
|
|
|
2011-11-15 21:58:05 +00:00
|
|
|
return options;
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
bool QSslSocketBackendPrivate::initSslContext()
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
|
2012-12-21 13:02:38 +00:00
|
|
|
// If no external context was set (e.g. bei QHttpNetworkConnection) we will create a default context
|
2013-04-17 15:42:32 +00:00
|
|
|
if (!sslContextPointer) {
|
|
|
|
// create a deep copy of our configuration
|
|
|
|
QSslConfigurationPrivate *configurationCopy = new QSslConfigurationPrivate(configuration);
|
|
|
|
configurationCopy->ref.store(0); // the QSslConfiguration constructor refs up
|
2014-04-09 06:08:01 +00:00
|
|
|
sslContextPointer = QSslContext::sharedFromConfiguration(mode, configurationCopy, allowRootCertOnDemandLoading);
|
2013-04-17 15:42:32 +00:00
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
|
2012-12-21 13:02:38 +00:00
|
|
|
if (sslContextPointer->error() != QSslError::NoError) {
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInvalidUserDataError, sslContextPointer->errorString());
|
2012-12-21 13:02:38 +00:00
|
|
|
sslContextPointer.clear(); // deletes the QSslContext
|
2011-04-27 10:05:43 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Create and initialize SSL session
|
2012-12-21 13:02:38 +00:00
|
|
|
if (!(ssl = sslContextPointer->createSsl())) {
|
2011-04-27 10:05:43 +00:00
|
|
|
// ### Bad error code
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Error creating SSL session, %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-07-30 08:08:36 +00:00
|
|
|
if (configuration.protocol != QSsl::SslV2 &&
|
|
|
|
configuration.protocol != QSsl::SslV3 &&
|
|
|
|
configuration.protocol != QSsl::UnknownProtocol &&
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
mode == QSslSocket::SslClientMode && QSslSocket::sslLibraryVersionNumber() >= 0x00090806fL) {
|
2011-04-27 10:05:43 +00:00
|
|
|
// Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format.
|
|
|
|
QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName;
|
|
|
|
if (tlsHostName.isEmpty())
|
|
|
|
tlsHostName = hostName;
|
|
|
|
QByteArray ace = QUrl::toAce(tlsHostName);
|
|
|
|
// only send the SNI header if the URL is valid and not an IP
|
2011-10-19 09:40:57 +00:00
|
|
|
if (!ace.isEmpty()
|
|
|
|
&& !QHostAddress().setAddress(tlsHostName)
|
|
|
|
&& !(configuration.sslOptions & QSsl::SslOptionDisableServerNameIndication)) {
|
2016-03-12 16:47:14 +00:00
|
|
|
// We don't send the trailing dot from the host header if present see
|
|
|
|
// https://tools.ietf.org/html/rfc6066#section-3
|
|
|
|
if (ace.endsWith('.'))
|
|
|
|
ace.chop(1);
|
2011-06-27 16:12:46 +00:00
|
|
|
if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.data()))
|
2014-12-08 12:35:47 +00:00
|
|
|
qCWarning(lcSsl, "could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled");
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Clear the session.
|
|
|
|
errorList.clear();
|
|
|
|
|
|
|
|
// Initialize memory BIOs for encryption and decryption.
|
|
|
|
readBio = q_BIO_new(q_BIO_s_mem());
|
|
|
|
writeBio = q_BIO_new(q_BIO_s_mem());
|
|
|
|
if (!readBio || !writeBio) {
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Error creating SSL session: %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Assign the bios.
|
|
|
|
q_SSL_set_bio(ssl, readBio, writeBio);
|
|
|
|
|
|
|
|
if (mode == QSslSocket::SslClientMode)
|
|
|
|
q_SSL_set_connect_state(ssl);
|
|
|
|
else
|
|
|
|
q_SSL_set_accept_state(ssl);
|
|
|
|
|
2014-10-15 13:13:47 +00:00
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L
|
|
|
|
// Save a pointer to this object into the SSL structure.
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L)
|
2014-10-15 13:13:47 +00:00
|
|
|
q_SSL_set_ex_data(ssl, s_indexForSSLExtraData, this);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if OPENSSL_VERSION_NUMBER >= 0x10001000L && !defined(OPENSSL_NO_PSK)
|
|
|
|
// Set the client callback for PSK
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
if (QSslSocket::sslLibraryVersionNumber() >= 0x10001000L) {
|
2016-03-23 11:27:11 +00:00
|
|
|
if (mode == QSslSocket::SslClientMode)
|
|
|
|
q_SSL_set_psk_client_callback(ssl, &q_ssl_psk_client_callback);
|
|
|
|
else if (mode == QSslSocket::SslServerMode)
|
|
|
|
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
|
|
|
|
}
|
2014-10-15 13:13:47 +00:00
|
|
|
#endif
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2012-01-30 15:52:27 +00:00
|
|
|
void QSslSocketBackendPrivate::destroySslContext()
|
|
|
|
{
|
|
|
|
if (ssl) {
|
|
|
|
q_SSL_free(ssl);
|
|
|
|
ssl = 0;
|
|
|
|
}
|
2012-12-21 13:02:38 +00:00
|
|
|
sslContextPointer.clear();
|
2012-01-30 15:52:27 +00:00
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
/*!
|
|
|
|
\internal
|
|
|
|
|
|
|
|
Does the minimum amount of initialization to determine whether SSL
|
|
|
|
is supported or not.
|
|
|
|
*/
|
|
|
|
|
|
|
|
bool QSslSocketPrivate::supportsSsl()
|
|
|
|
{
|
|
|
|
return ensureLibraryLoaded();
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\internal
|
|
|
|
|
|
|
|
Declared static in QSslSocketPrivate, makes sure the SSL libraries have
|
|
|
|
been initialized.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void QSslSocketPrivate::ensureInitialized()
|
|
|
|
{
|
|
|
|
if (!supportsSsl())
|
|
|
|
return;
|
|
|
|
|
|
|
|
ensureCiphersAndCertsLoaded();
|
|
|
|
}
|
|
|
|
|
2014-03-10 16:39:46 +00:00
|
|
|
long QSslSocketPrivate::sslLibraryBuildVersionNumber()
|
|
|
|
{
|
|
|
|
return OPENSSL_VERSION_NUMBER;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString QSslSocketPrivate::sslLibraryBuildVersionString()
|
|
|
|
{
|
2015-05-23 11:11:09 +00:00
|
|
|
// Using QStringLiteral to store the version string as unicode and
|
|
|
|
// avoid false positives from Google searching the playstore for old
|
|
|
|
// SSL versions. See QTBUG-46265
|
|
|
|
return QStringLiteral(OPENSSL_VERSION_TEXT);
|
2014-03-10 16:39:46 +00:00
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
/*!
|
|
|
|
\internal
|
|
|
|
|
|
|
|
Declared static in QSslSocketPrivate, backend-dependent loading of
|
|
|
|
application-wide global ciphers.
|
|
|
|
*/
|
|
|
|
void QSslSocketPrivate::resetDefaultCiphers()
|
|
|
|
{
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
#if QT_CONFIG(opensslv11)
|
|
|
|
SSL_CTX *myCtx = q_SSL_CTX_new(q_TLS_client_method());
|
|
|
|
#else
|
2011-04-27 10:05:43 +00:00
|
|
|
SSL_CTX *myCtx = q_SSL_CTX_new(q_SSLv23_client_method());
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
#endif
|
2011-04-27 10:05:43 +00:00
|
|
|
SSL *mySsl = q_SSL_new(myCtx);
|
|
|
|
|
|
|
|
QList<QSslCipher> ciphers;
|
2014-01-17 21:23:20 +00:00
|
|
|
QList<QSslCipher> defaultCiphers;
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
STACK_OF(SSL_CIPHER) *supportedCiphers = q_SSL_get_ciphers(mySsl);
|
|
|
|
for (int i = 0; i < q_sk_SSL_CIPHER_num(supportedCiphers); ++i) {
|
|
|
|
if (SSL_CIPHER *cipher = q_sk_SSL_CIPHER_value(supportedCiphers, i)) {
|
2015-02-08 11:38:18 +00:00
|
|
|
QSslCipher ciph = QSslSocketBackendPrivate::QSslCipher_from_SSL_CIPHER(cipher);
|
|
|
|
if (!ciph.isNull()) {
|
2015-04-18 11:44:30 +00:00
|
|
|
// Unconditionally exclude ADH and AECDH ciphers since they offer no MITM protection
|
|
|
|
if (!ciph.name().toLower().startsWith(QLatin1String("adh")) &&
|
|
|
|
!ciph.name().toLower().startsWith(QLatin1String("exp-adh")) &&
|
2016-02-10 16:20:35 +00:00
|
|
|
!ciph.name().toLower().startsWith(QLatin1String("aecdh"))) {
|
2015-02-08 11:38:18 +00:00
|
|
|
ciphers << ciph;
|
2016-02-10 16:20:35 +00:00
|
|
|
|
|
|
|
if (ciph.usedBits() >= 128)
|
|
|
|
defaultCiphers << ciph;
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
q_SSL_CTX_free(myCtx);
|
|
|
|
q_SSL_free(mySsl);
|
|
|
|
|
|
|
|
setDefaultSupportedCiphers(ciphers);
|
2014-01-17 21:23:20 +00:00
|
|
|
setDefaultCiphers(defaultCiphers);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
2014-09-03 09:12:12 +00:00
|
|
|
void QSslSocketPrivate::resetDefaultEllipticCurves()
|
|
|
|
{
|
|
|
|
QVector<QSslEllipticCurve> curves;
|
|
|
|
|
|
|
|
#ifndef OPENSSL_NO_EC
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
const size_t curveCount = q_EC_get_builtin_curves(nullptr, 0);
|
2014-09-03 09:12:12 +00:00
|
|
|
|
|
|
|
QVarLengthArray<EC_builtin_curve> builtinCurves(static_cast<int>(curveCount));
|
|
|
|
|
|
|
|
if (q_EC_get_builtin_curves(builtinCurves.data(), curveCount) == curveCount) {
|
2015-06-01 13:05:41 +00:00
|
|
|
curves.reserve(int(curveCount));
|
2014-09-03 09:12:12 +00:00
|
|
|
for (size_t i = 0; i < curveCount; ++i) {
|
|
|
|
QSslEllipticCurve curve;
|
2015-03-05 23:23:53 +00:00
|
|
|
curve.id = builtinCurves[int(i)].nid;
|
2014-09-03 09:12:12 +00:00
|
|
|
curves.append(curve);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // OPENSSL_NO_EC
|
|
|
|
|
|
|
|
// set the list of supported ECs, but not the list
|
|
|
|
// of *default* ECs. OpenSSL doesn't like forcing an EC for the wrong
|
|
|
|
// ciphersuite, so don't try it -- leave the empty list to mean
|
|
|
|
// "the implementation will choose the most suitable one".
|
|
|
|
setDefaultSupportedEllipticCurves(curves);
|
|
|
|
}
|
|
|
|
|
2015-11-16 14:06:15 +00:00
|
|
|
#ifndef Q_OS_DARWIN // Apple implementation in qsslsocket_mac_shared.cpp
|
2011-04-27 10:05:43 +00:00
|
|
|
QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
|
|
|
|
{
|
|
|
|
ensureInitialized();
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
|
|
|
QElapsedTimer timer;
|
|
|
|
timer.start();
|
|
|
|
#endif
|
|
|
|
QList<QSslCertificate> systemCerts;
|
2015-11-16 14:06:15 +00:00
|
|
|
#if defined(Q_OS_WIN)
|
2011-04-27 10:05:43 +00:00
|
|
|
if (ptrCertOpenSystemStoreW && ptrCertFindCertificateInStore && ptrCertCloseStore) {
|
|
|
|
HCERTSTORE hSystemStore;
|
|
|
|
hSystemStore = ptrCertOpenSystemStoreW(0, L"ROOT");
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
if (hSystemStore) {
|
|
|
|
PCCERT_CONTEXT pc = nullptr;
|
|
|
|
while (1) {
|
|
|
|
pc = ptrCertFindCertificateInStore(hSystemStore, X509_ASN_ENCODING, 0, CERT_FIND_ANY, nullptr, pc);
|
|
|
|
if (!pc)
|
2011-04-27 10:05:43 +00:00
|
|
|
break;
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
QByteArray der(reinterpret_cast<const char *>(pc->pbCertEncoded),
|
|
|
|
static_cast<int>(pc->cbCertEncoded));
|
2011-04-27 10:05:43 +00:00
|
|
|
QSslCertificate cert(der, QSsl::Der);
|
|
|
|
systemCerts.append(cert);
|
|
|
|
}
|
|
|
|
ptrCertCloseStore(hSystemStore, 0);
|
|
|
|
}
|
|
|
|
}
|
2011-11-01 13:20:19 +00:00
|
|
|
#elif defined(Q_OS_UNIX)
|
2011-04-27 10:05:43 +00:00
|
|
|
QSet<QString> certFiles;
|
|
|
|
QDir currentDir;
|
|
|
|
QStringList nameFilters;
|
2013-07-25 12:40:06 +00:00
|
|
|
QList<QByteArray> directories;
|
|
|
|
QSsl::EncodingFormat platformEncodingFormat;
|
|
|
|
# ifndef Q_OS_ANDROID
|
|
|
|
directories = unixRootCertDirectories();
|
2011-04-27 10:05:43 +00:00
|
|
|
nameFilters << QLatin1String("*.pem") << QLatin1String("*.crt");
|
2013-07-25 12:40:06 +00:00
|
|
|
platformEncodingFormat = QSsl::Pem;
|
2013-03-04 09:16:42 +00:00
|
|
|
# else
|
2013-07-25 12:40:06 +00:00
|
|
|
// Q_OS_ANDROID
|
|
|
|
QByteArray ministroPath = qgetenv("MINISTRO_SSL_CERTS_PATH"); // Set by Ministro
|
|
|
|
directories << ministroPath;
|
|
|
|
nameFilters << QLatin1String("*.der");
|
|
|
|
platformEncodingFormat = QSsl::Der;
|
2017-06-02 09:53:23 +00:00
|
|
|
# ifndef Q_OS_ANDROID_EMBEDDED
|
2013-07-25 12:40:06 +00:00
|
|
|
if (ministroPath.isEmpty()) {
|
|
|
|
QList<QByteArray> certificateData = fetchSslCertificateData();
|
|
|
|
for (int i = 0; i < certificateData.size(); ++i) {
|
|
|
|
systemCerts.append(QSslCertificate::fromData(certificateData.at(i), QSsl::Der));
|
|
|
|
}
|
|
|
|
} else
|
2017-06-02 09:53:23 +00:00
|
|
|
# endif //Q_OS_ANDROID_EMBEDDED
|
2013-07-25 12:40:06 +00:00
|
|
|
# endif //Q_OS_ANDROID
|
|
|
|
{
|
|
|
|
currentDir.setNameFilters(nameFilters);
|
|
|
|
for (int a = 0; a < directories.count(); a++) {
|
|
|
|
currentDir.setPath(QLatin1String(directories.at(a)));
|
|
|
|
QDirIterator it(currentDir);
|
|
|
|
while (it.hasNext()) {
|
|
|
|
it.next();
|
|
|
|
// use canonical path here to not load the same certificate twice if symlinked
|
|
|
|
certFiles.insert(it.fileInfo().canonicalFilePath());
|
|
|
|
}
|
|
|
|
}
|
2016-03-04 07:51:12 +00:00
|
|
|
for (const QString& file : qAsConst(certFiles))
|
|
|
|
systemCerts.append(QSslCertificate::fromPath(file, platformEncodingFormat));
|
2013-03-04 09:16:42 +00:00
|
|
|
# ifndef Q_OS_ANDROID
|
2013-07-25 12:40:06 +00:00
|
|
|
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/etc/pki/tls/certs/ca-bundle.crt"), QSsl::Pem)); // Fedora, Mandriva
|
|
|
|
systemCerts.append(QSslCertificate::fromPath(QLatin1String("/usr/local/share/certs/ca-root-nss.crt"), QSsl::Pem)); // FreeBSD's ca_root_nss
|
2013-03-04 09:16:42 +00:00
|
|
|
# endif
|
2013-07-25 12:40:06 +00:00
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "systemCaCertificates retrieval time " << timer.elapsed() << "ms";
|
|
|
|
qCDebug(lcSsl) << "imported " << systemCerts.count() << " certificates";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
return systemCerts;
|
|
|
|
}
|
2015-11-16 14:06:15 +00:00
|
|
|
#endif // Q_OS_DARWIN
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
void QSslSocketBackendPrivate::startClientEncryption()
|
|
|
|
{
|
|
|
|
if (!initSslContext()) {
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Unable to init SSL Context: %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start connecting. This will place outgoing data in the BIO, so we
|
|
|
|
// follow up with calling transmit().
|
|
|
|
startHandshake();
|
|
|
|
transmit();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QSslSocketBackendPrivate::startServerEncryption()
|
|
|
|
{
|
|
|
|
if (!initSslContext()) {
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Unable to init SSL Context: %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Start connecting. This will place outgoing data in the BIO, so we
|
|
|
|
// follow up with calling transmit().
|
|
|
|
startHandshake();
|
|
|
|
transmit();
|
|
|
|
}
|
|
|
|
|
|
|
|
/*!
|
|
|
|
\internal
|
|
|
|
|
|
|
|
Transmits encrypted data between the BIOs and the socket.
|
|
|
|
*/
|
|
|
|
void QSslSocketBackendPrivate::transmit()
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
|
|
|
|
// If we don't have any SSL context, don't bother transmitting.
|
|
|
|
if (!ssl)
|
|
|
|
return;
|
|
|
|
|
|
|
|
bool transmitting;
|
|
|
|
do {
|
|
|
|
transmitting = false;
|
|
|
|
|
|
|
|
// If the connection is secure, we can transfer data from the write
|
|
|
|
// buffer (in plain text) to the write BIO through SSL_write.
|
|
|
|
if (connectionEncrypted && !writeBuffer.isEmpty()) {
|
|
|
|
qint64 totalBytesWritten = 0;
|
|
|
|
int nextDataBlockSize;
|
|
|
|
while ((nextDataBlockSize = writeBuffer.nextDataBlockSize()) > 0) {
|
|
|
|
int writtenBytes = q_SSL_write(ssl, writeBuffer.readPointer(), nextDataBlockSize);
|
|
|
|
if (writtenBytes <= 0) {
|
2013-07-25 17:22:01 +00:00
|
|
|
int error = q_SSL_get_error(ssl, writtenBytes);
|
|
|
|
//write can result in a want_write_error - not an error - continue transmitting
|
|
|
|
if (error == SSL_ERROR_WANT_WRITE) {
|
|
|
|
transmitting = true;
|
|
|
|
break;
|
|
|
|
} else if (error == SSL_ERROR_WANT_READ) {
|
|
|
|
//write can result in a want_read error, possibly due to renegotiation - not an error - stop transmitting
|
|
|
|
transmitting = false;
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
// ### Better error handling.
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Unable to write data: %1").arg(
|
|
|
|
getErrorsFromOpenSsl()));
|
2013-07-25 17:22:01 +00:00
|
|
|
return;
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: encrypted" << writtenBytes << "bytes";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
writeBuffer.free(writtenBytes);
|
|
|
|
totalBytesWritten += writtenBytes;
|
|
|
|
|
|
|
|
if (writtenBytes < nextDataBlockSize) {
|
|
|
|
// break out of the writing loop and try again after we had read
|
|
|
|
transmitting = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (totalBytesWritten > 0) {
|
|
|
|
// Don't emit bytesWritten() recursively.
|
|
|
|
if (!emittedBytesWritten) {
|
|
|
|
emittedBytesWritten = true;
|
|
|
|
emit q->bytesWritten(totalBytesWritten);
|
|
|
|
emittedBytesWritten = false;
|
|
|
|
}
|
2015-09-14 12:53:13 +00:00
|
|
|
emit q->channelBytesWritten(0, totalBytesWritten);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if we've got any data to be written to the socket.
|
|
|
|
QVarLengthArray<char, 4096> data;
|
|
|
|
int pendingBytes;
|
|
|
|
while (plainSocket->isValid() && (pendingBytes = q_BIO_pending(writeBio)) > 0) {
|
|
|
|
// Read encrypted data from the write BIO into a buffer.
|
|
|
|
data.resize(pendingBytes);
|
|
|
|
int encryptedBytesRead = q_BIO_read(writeBio, data.data(), pendingBytes);
|
|
|
|
|
|
|
|
// Write encrypted data from the buffer to the socket.
|
2011-12-19 15:10:45 +00:00
|
|
|
qint64 actualWritten = plainSocket->write(data.constData(), encryptedBytesRead);
|
2011-04-27 10:05:43 +00:00
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: wrote" << encryptedBytesRead << "encrypted bytes to the socket" << actualWritten << "actual.";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
2011-12-19 15:10:45 +00:00
|
|
|
if (actualWritten < 0) {
|
|
|
|
//plain socket write fails if it was in the pending close state.
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(plainSocket->error(), plainSocket->errorString());
|
2011-12-19 15:10:45 +00:00
|
|
|
return;
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
transmitting = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check if we've got any data to be read from the socket.
|
2012-05-30 15:03:57 +00:00
|
|
|
if (!connectionEncrypted || !readBufferMaxSize || buffer.size() < readBufferMaxSize)
|
2011-04-27 10:05:43 +00:00
|
|
|
while ((pendingBytes = plainSocket->bytesAvailable()) > 0) {
|
|
|
|
// Read encrypted data from the socket into a buffer.
|
|
|
|
data.resize(pendingBytes);
|
|
|
|
// just peek() here because q_BIO_write could write less data than expected
|
|
|
|
int encryptedBytesRead = plainSocket->peek(data.data(), pendingBytes);
|
2012-05-30 15:03:57 +00:00
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: read" << encryptedBytesRead << "encrypted bytes from the socket";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
// Write encrypted data from the buffer into the read BIO.
|
|
|
|
int writtenToBio = q_BIO_write(readBio, data.constData(), encryptedBytesRead);
|
|
|
|
|
2017-05-08 17:07:37 +00:00
|
|
|
// Throw away the results.
|
2011-04-27 10:05:43 +00:00
|
|
|
if (writtenToBio > 0) {
|
2017-05-08 17:07:37 +00:00
|
|
|
plainSocket->skip(writtenToBio);
|
2011-04-27 10:05:43 +00:00
|
|
|
} else {
|
|
|
|
// ### Better error handling.
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Unable to decrypt data: %1").arg(
|
|
|
|
getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
transmitting = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the connection isn't secured yet, this is the time to retry the
|
|
|
|
// connect / accept.
|
|
|
|
if (!connectionEncrypted) {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: testing encryption";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
if (startHandshake()) {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: encryption established";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
connectionEncrypted = true;
|
|
|
|
transmitting = true;
|
|
|
|
} else if (plainSocket->state() != QAbstractSocket::ConnectedState) {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: connection lost";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
break;
|
2012-01-20 12:55:15 +00:00
|
|
|
} else if (paused) {
|
|
|
|
// just wait until the user continues
|
|
|
|
return;
|
2011-04-27 10:05:43 +00:00
|
|
|
} else {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: encryption not done yet";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If the request is small and the remote host closes the transmission
|
|
|
|
// after sending, there's a chance that startHandshake() will already
|
|
|
|
// have triggered a shutdown.
|
|
|
|
if (!ssl)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// We always read everything from the SSL decryption buffers, even if
|
|
|
|
// we have a readBufferMaxSize. There's no point in leaving data there
|
|
|
|
// just so that readBuffer.size() == readBufferMaxSize.
|
|
|
|
int readBytes = 0;
|
2017-07-26 10:39:11 +00:00
|
|
|
const int bytesToRead = 4096;
|
2011-04-27 10:05:43 +00:00
|
|
|
do {
|
|
|
|
// Don't use SSL_pending(). It's very unreliable.
|
2017-07-26 10:39:11 +00:00
|
|
|
readBytes = q_SSL_read(ssl, buffer.reserve(bytesToRead), bytesToRead);
|
|
|
|
if (readBytes > 0) {
|
2011-04-27 10:05:43 +00:00
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: decrypted" << readBytes << "bytes";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
2017-07-26 10:39:11 +00:00
|
|
|
buffer.chop(bytesToRead - readBytes);
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
if (readyReadEmittedPointer)
|
|
|
|
*readyReadEmittedPointer = true;
|
|
|
|
emit q->readyRead();
|
2015-09-14 12:53:13 +00:00
|
|
|
emit q->channelReadyRead(0);
|
2011-04-27 10:05:43 +00:00
|
|
|
transmitting = true;
|
|
|
|
continue;
|
|
|
|
}
|
2017-07-26 10:39:11 +00:00
|
|
|
buffer.chop(bytesToRead);
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
// Error.
|
|
|
|
switch (q_SSL_get_error(ssl, readBytes)) {
|
|
|
|
case SSL_ERROR_WANT_READ:
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
|
|
|
// Out of data.
|
|
|
|
break;
|
|
|
|
case SSL_ERROR_ZERO_RETURN:
|
|
|
|
// The remote host closed the connection.
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::transmit: remote disconnect";
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
2013-04-04 09:30:43 +00:00
|
|
|
shutdown = true; // the other side shut down, make sure we do not send shutdown ourselves
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::RemoteHostClosedError,
|
|
|
|
QSslSocket::tr("The TLS/SSL connection has been closed"));
|
2013-04-04 09:30:43 +00:00
|
|
|
return;
|
2011-04-27 10:05:43 +00:00
|
|
|
case SSL_ERROR_SYSCALL: // some IO error
|
|
|
|
case SSL_ERROR_SSL: // error in the SSL library
|
|
|
|
// we do not know exactly what the error is, nor whether we can recover from it,
|
|
|
|
// so just return to prevent an endless loop in the outer "while" statement
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Error while reading: %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
return;
|
|
|
|
default:
|
|
|
|
// SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT: can only happen with a
|
|
|
|
// BIO_s_connect() or BIO_s_accept(), which we do not call.
|
|
|
|
// SSL_ERROR_WANT_X509_LOOKUP: can only happen with a
|
|
|
|
// SSL_CTX_set_client_cert_cb(), which we do not call.
|
|
|
|
// So this default case should never be triggered.
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslInternalError,
|
|
|
|
QSslSocket::tr("Error while reading: %1").arg(getErrorsFromOpenSsl()));
|
2011-04-27 10:05:43 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
} while (ssl && readBytes > 0);
|
2012-12-21 13:02:38 +00:00
|
|
|
} while (ssl && transmitting);
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static QSslError _q_OpenSSL_to_QSslError(int errorCode, const QSslCertificate &cert)
|
|
|
|
{
|
|
|
|
QSslError error;
|
|
|
|
switch (errorCode) {
|
|
|
|
case X509_V_OK:
|
|
|
|
// X509_V_OK is also reported if the peer had no certificate.
|
|
|
|
break;
|
|
|
|
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
|
|
|
|
error = QSslError(QSslError::UnableToGetIssuerCertificate, cert); break;
|
|
|
|
case X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE:
|
|
|
|
error = QSslError(QSslError::UnableToDecryptCertificateSignature, cert); break;
|
|
|
|
case X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY:
|
|
|
|
error = QSslError(QSslError::UnableToDecodeIssuerPublicKey, cert); break;
|
|
|
|
case X509_V_ERR_CERT_SIGNATURE_FAILURE:
|
|
|
|
error = QSslError(QSslError::CertificateSignatureFailed, cert); break;
|
|
|
|
case X509_V_ERR_CERT_NOT_YET_VALID:
|
|
|
|
error = QSslError(QSslError::CertificateNotYetValid, cert); break;
|
|
|
|
case X509_V_ERR_CERT_HAS_EXPIRED:
|
|
|
|
error = QSslError(QSslError::CertificateExpired, cert); break;
|
|
|
|
case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
|
|
|
|
error = QSslError(QSslError::InvalidNotBeforeField, cert); break;
|
|
|
|
case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
|
|
|
|
error = QSslError(QSslError::InvalidNotAfterField, cert); break;
|
|
|
|
case X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT:
|
|
|
|
error = QSslError(QSslError::SelfSignedCertificate, cert); break;
|
|
|
|
case X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN:
|
|
|
|
error = QSslError(QSslError::SelfSignedCertificateInChain, cert); break;
|
|
|
|
case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY:
|
|
|
|
error = QSslError(QSslError::UnableToGetLocalIssuerCertificate, cert); break;
|
|
|
|
case X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE:
|
|
|
|
error = QSslError(QSslError::UnableToVerifyFirstCertificate, cert); break;
|
|
|
|
case X509_V_ERR_CERT_REVOKED:
|
|
|
|
error = QSslError(QSslError::CertificateRevoked, cert); break;
|
|
|
|
case X509_V_ERR_INVALID_CA:
|
|
|
|
error = QSslError(QSslError::InvalidCaCertificate, cert); break;
|
|
|
|
case X509_V_ERR_PATH_LENGTH_EXCEEDED:
|
|
|
|
error = QSslError(QSslError::PathLengthExceeded, cert); break;
|
|
|
|
case X509_V_ERR_INVALID_PURPOSE:
|
|
|
|
error = QSslError(QSslError::InvalidPurpose, cert); break;
|
|
|
|
case X509_V_ERR_CERT_UNTRUSTED:
|
|
|
|
error = QSslError(QSslError::CertificateUntrusted, cert); break;
|
|
|
|
case X509_V_ERR_CERT_REJECTED:
|
|
|
|
error = QSslError(QSslError::CertificateRejected, cert); break;
|
|
|
|
default:
|
|
|
|
error = QSslError(QSslError::UnspecifiedError, cert); break;
|
|
|
|
}
|
|
|
|
return error;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool QSslSocketBackendPrivate::startHandshake()
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
|
|
|
|
// Check if the connection has been established. Get all errors from the
|
|
|
|
// verification stage.
|
2016-01-17 02:08:01 +00:00
|
|
|
QMutexLocker locker(&_q_sslErrorList()->mutex);
|
2011-04-27 10:05:43 +00:00
|
|
|
_q_sslErrorList()->errors.clear();
|
|
|
|
int result = (mode == QSslSocket::SslClientMode) ? q_SSL_connect(ssl) : q_SSL_accept(ssl);
|
|
|
|
|
2016-01-17 13:16:43 +00:00
|
|
|
const auto &lastErrors = _q_sslErrorList()->errors;
|
2015-02-03 14:32:53 +00:00
|
|
|
if (!lastErrors.isEmpty())
|
|
|
|
storePeerCertificates();
|
2016-01-17 13:16:43 +00:00
|
|
|
for (const auto ¤tError : lastErrors) {
|
|
|
|
emit q->peerVerifyError(_q_OpenSSL_to_QSslError(currentError.code,
|
|
|
|
configuration.peerCertificateChain.value(currentError.depth)));
|
2011-04-27 10:05:43 +00:00
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
errorList << lastErrors;
|
2016-01-17 02:08:01 +00:00
|
|
|
locker.unlock();
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
// Connection aborted during handshake phase.
|
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// Check if we're encrypted or not.
|
|
|
|
if (result <= 0) {
|
|
|
|
switch (q_SSL_get_error(ssl, result)) {
|
|
|
|
case SSL_ERROR_WANT_READ:
|
|
|
|
case SSL_ERROR_WANT_WRITE:
|
|
|
|
// The handshake is not yet complete.
|
|
|
|
break;
|
|
|
|
default:
|
2015-07-10 14:10:44 +00:00
|
|
|
QString errorString
|
|
|
|
= QSslSocket::tr("Error during SSL handshake: %1").arg(getErrorsFromOpenSsl());
|
2011-04-27 10:05:43 +00:00
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2015-07-10 14:10:44 +00:00
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::startHandshake: error!" << errorString;
|
2011-04-27 10:05:43 +00:00
|
|
|
#endif
|
2015-07-10 14:10:44 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, errorString);
|
2011-04-27 10:05:43 +00:00
|
|
|
q->abort();
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2015-02-03 14:32:53 +00:00
|
|
|
// store peer certificate chain
|
|
|
|
storePeerCertificates();
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
// Start translating errors.
|
|
|
|
QList<QSslError> errors;
|
|
|
|
|
2011-09-05 10:53:49 +00:00
|
|
|
// check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
|
2016-01-26 13:38:54 +00:00
|
|
|
for (const QSslCertificate &cert : qAsConst(configuration.peerCertificateChain)) {
|
2011-09-05 10:53:49 +00:00
|
|
|
if (QSslCertificatePrivate::isBlacklisted(cert)) {
|
|
|
|
QSslError error(QSslError::CertificateBlacklisted, cert);
|
|
|
|
errors << error;
|
|
|
|
emit q->peerVerifyError(error);
|
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
return false;
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer
|
|
|
|
|| (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer
|
|
|
|
&& mode == QSslSocket::SslClientMode);
|
|
|
|
|
|
|
|
// Check the peer certificate itself. First try the subject's common name
|
|
|
|
// (CN) as a wildcard, then try all alternate subject name DNS entries the
|
|
|
|
// same way.
|
|
|
|
if (!configuration.peerCertificate.isNull()) {
|
|
|
|
// but only if we're a client connecting to a server
|
|
|
|
// if we're the server, don't check CN
|
|
|
|
if (mode == QSslSocket::SslClientMode) {
|
|
|
|
QString peerName = (verificationPeerName.isEmpty () ? q->peerName() : verificationPeerName);
|
|
|
|
|
2011-06-18 14:53:53 +00:00
|
|
|
if (!isMatchingHostname(configuration.peerCertificate, peerName)) {
|
|
|
|
// No matches in common names or alternate names.
|
|
|
|
QSslError error(QSslError::HostNameMismatch, configuration.peerCertificate);
|
|
|
|
errors << error;
|
|
|
|
emit q->peerVerifyError(error);
|
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
return false;
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// No peer certificate presented. Report as error if the socket
|
|
|
|
// expected one.
|
|
|
|
if (doVerifyPeer) {
|
|
|
|
QSslError error(QSslError::NoPeerCertificate);
|
|
|
|
errors << error;
|
|
|
|
emit q->peerVerifyError(error);
|
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Translate errors from the error list into QSslErrors.
|
2016-01-17 13:16:43 +00:00
|
|
|
errors.reserve(errors.size() + errorList.size());
|
|
|
|
for (const auto &error : qAsConst(errorList))
|
|
|
|
errors << _q_OpenSSL_to_QSslError(error.code, configuration.peerCertificateChain.value(error.depth));
|
2011-04-27 10:05:43 +00:00
|
|
|
|
|
|
|
if (!errors.isEmpty()) {
|
|
|
|
sslErrors = errors;
|
2012-03-23 11:01:42 +00:00
|
|
|
|
|
|
|
#ifdef Q_OS_WIN
|
|
|
|
//Skip this if not using system CAs, or if the SSL errors are configured in advance to be ignorable
|
2012-04-18 14:33:24 +00:00
|
|
|
if (doVerifyPeer
|
|
|
|
&& s_loadRootCertsOnDemand
|
2012-03-23 11:01:42 +00:00
|
|
|
&& allowRootCertOnDemandLoading
|
|
|
|
&& !verifyErrorsHaveBeenIgnored()) {
|
|
|
|
//Windows desktop versions starting from vista ship with minimal set of roots
|
|
|
|
//and download on demand from the windows update server CA roots that are
|
|
|
|
//trusted by MS.
|
|
|
|
//However, this is only transparent if using WinINET - we have to trigger it
|
|
|
|
//ourselves.
|
2012-04-18 14:33:24 +00:00
|
|
|
QSslCertificate certToFetch;
|
|
|
|
bool fetchCertificate = true;
|
2012-03-23 11:01:42 +00:00
|
|
|
for (int i=0; i< sslErrors.count(); i++) {
|
2012-04-18 14:33:24 +00:00
|
|
|
switch (sslErrors.at(i).error()) {
|
2012-04-27 19:05:05 +00:00
|
|
|
case QSslError::UnableToGetLocalIssuerCertificate: // site presented intermediate cert, but root is unknown
|
|
|
|
case QSslError::SelfSignedCertificateInChain: // site presented a complete chain, but root is unknown
|
2012-04-18 14:33:24 +00:00
|
|
|
certToFetch = sslErrors.at(i).certificate();
|
|
|
|
break;
|
|
|
|
case QSslError::SelfSignedCertificate:
|
|
|
|
case QSslError::CertificateBlacklisted:
|
|
|
|
//With these errors, we know it will be untrusted so save time by not asking windows
|
|
|
|
fetchCertificate = false;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << sslErrors.at(i).errorString();
|
2012-04-18 14:33:24 +00:00
|
|
|
#endif
|
|
|
|
break;
|
2012-03-23 11:01:42 +00:00
|
|
|
}
|
2012-01-20 12:55:15 +00:00
|
|
|
}
|
2012-04-18 14:33:24 +00:00
|
|
|
if (fetchCertificate && !certToFetch.isNull()) {
|
|
|
|
fetchCaRootForCert(certToFetch);
|
|
|
|
return false;
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
2012-03-23 11:01:42 +00:00
|
|
|
#endif
|
|
|
|
if (!checkSslErrors())
|
|
|
|
return false;
|
2016-06-09 08:36:50 +00:00
|
|
|
// A slot, attached to sslErrors signal can call
|
|
|
|
// abort/close/disconnetFromHost/etc; no need to
|
|
|
|
// continue handshake then.
|
|
|
|
if (q->state() != QAbstractSocket::ConnectedState)
|
|
|
|
return false;
|
2011-04-27 10:05:43 +00:00
|
|
|
} else {
|
|
|
|
sslErrors.clear();
|
|
|
|
}
|
|
|
|
|
2012-01-20 12:55:15 +00:00
|
|
|
continueHandshake();
|
2011-04-27 10:05:43 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2015-02-03 14:32:53 +00:00
|
|
|
void QSslSocketBackendPrivate::storePeerCertificates()
|
|
|
|
{
|
|
|
|
// Store the peer certificate and chain. For clients, the peer certificate
|
|
|
|
// chain includes the peer certificate; for servers, it doesn't. Both the
|
|
|
|
// peer certificate and the chain may be empty if the peer didn't present
|
|
|
|
// any certificate.
|
|
|
|
X509 *x509 = q_SSL_get_peer_certificate(ssl);
|
|
|
|
configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
|
|
|
|
q_X509_free(x509);
|
|
|
|
if (configuration.peerCertificateChain.isEmpty()) {
|
|
|
|
configuration.peerCertificateChain = STACKOFX509_to_QSslCertificates(q_SSL_get_peer_cert_chain(ssl));
|
|
|
|
if (!configuration.peerCertificate.isNull() && mode == QSslSocket::SslServerMode)
|
|
|
|
configuration.peerCertificateChain.prepend(configuration.peerCertificate);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-23 11:01:42 +00:00
|
|
|
bool QSslSocketBackendPrivate::checkSslErrors()
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
if (sslErrors.isEmpty())
|
|
|
|
return true;
|
|
|
|
|
|
|
|
emit q->sslErrors(sslErrors);
|
|
|
|
|
|
|
|
bool doVerifyPeer = configuration.peerVerifyMode == QSslSocket::VerifyPeer
|
|
|
|
|| (configuration.peerVerifyMode == QSslSocket::AutoVerifyPeer
|
|
|
|
&& mode == QSslSocket::SslClientMode);
|
|
|
|
bool doEmitSslError = !verifyErrorsHaveBeenIgnored();
|
|
|
|
// check whether we need to emit an SSL handshake error
|
|
|
|
if (doVerifyPeer && doEmitSslError) {
|
2012-04-30 18:14:06 +00:00
|
|
|
if (q->pauseMode() & QAbstractSocket::PauseOnSslErrors) {
|
2012-03-23 11:01:42 +00:00
|
|
|
pauseSocketNotifiers(q);
|
|
|
|
paused = true;
|
|
|
|
} else {
|
2016-04-13 15:49:59 +00:00
|
|
|
setErrorAndEmit(QAbstractSocket::SslHandshakeFailedError, sslErrors.constFirst().errorString());
|
2012-03-23 11:01:42 +00:00
|
|
|
plainSocket->disconnectFromHost();
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2014-10-15 13:13:47 +00:00
|
|
|
unsigned int QSslSocketBackendPrivate::tlsPskClientCallback(const char *hint,
|
|
|
|
char *identity, unsigned int max_identity_len,
|
|
|
|
unsigned char *psk, unsigned int max_psk_len)
|
|
|
|
{
|
|
|
|
QSslPreSharedKeyAuthenticator authenticator;
|
|
|
|
|
|
|
|
// Fill in some read-only fields (for the user)
|
|
|
|
if (hint)
|
|
|
|
authenticator.d->identityHint = QByteArray::fromRawData(hint, int(::strlen(hint))); // it's NUL terminated, but do not include the NUL
|
|
|
|
|
|
|
|
authenticator.d->maximumIdentityLength = int(max_identity_len) - 1; // needs to be NUL terminated
|
|
|
|
authenticator.d->maximumPreSharedKeyLength = int(max_psk_len);
|
|
|
|
|
|
|
|
// Let the client provide the remaining bits...
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
emit q->preSharedKeyAuthenticationRequired(&authenticator);
|
|
|
|
|
|
|
|
// No PSK set? Return now to make the handshake fail
|
|
|
|
if (authenticator.preSharedKey().isEmpty())
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
// Copy data back into OpenSSL
|
|
|
|
const int identityLength = qMin(authenticator.identity().length(), authenticator.maximumIdentityLength());
|
|
|
|
::memcpy(identity, authenticator.identity().constData(), identityLength);
|
|
|
|
identity[identityLength] = 0;
|
|
|
|
|
|
|
|
const int pskLength = qMin(authenticator.preSharedKey().length(), authenticator.maximumPreSharedKeyLength());
|
|
|
|
::memcpy(psk, authenticator.preSharedKey().constData(), pskLength);
|
2016-03-23 11:27:11 +00:00
|
|
|
return pskLength;
|
|
|
|
}
|
|
|
|
|
|
|
|
unsigned int QSslSocketBackendPrivate::tlsPskServerCallback(const char *identity,
|
|
|
|
unsigned char *psk, unsigned int max_psk_len)
|
|
|
|
{
|
|
|
|
QSslPreSharedKeyAuthenticator authenticator;
|
|
|
|
|
|
|
|
// Fill in some read-only fields (for the user)
|
|
|
|
authenticator.d->identityHint = configuration.preSharedKeyIdentityHint;
|
|
|
|
authenticator.d->identity = identity;
|
|
|
|
authenticator.d->maximumIdentityLength = 0; // user cannot set an identity
|
|
|
|
authenticator.d->maximumPreSharedKeyLength = int(max_psk_len);
|
|
|
|
|
|
|
|
// Let the client provide the remaining bits...
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
emit q->preSharedKeyAuthenticationRequired(&authenticator);
|
|
|
|
|
|
|
|
// No PSK set? Return now to make the handshake fail
|
|
|
|
if (authenticator.preSharedKey().isEmpty())
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
// Copy data back into OpenSSL
|
|
|
|
const int pskLength = qMin(authenticator.preSharedKey().length(), authenticator.maximumPreSharedKeyLength());
|
|
|
|
::memcpy(psk, authenticator.preSharedKey().constData(), pskLength);
|
2014-10-15 13:13:47 +00:00
|
|
|
return pskLength;
|
|
|
|
}
|
|
|
|
|
2012-03-23 11:01:42 +00:00
|
|
|
#ifdef Q_OS_WIN
|
|
|
|
|
|
|
|
void QSslSocketBackendPrivate::fetchCaRootForCert(const QSslCertificate &cert)
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
|
|
|
//The root certificate is downloaded from windows update, which blocks for 15 seconds in the worst case
|
|
|
|
//so the request is done in a worker thread.
|
|
|
|
QWindowsCaRootFetcher *fetcher = new QWindowsCaRootFetcher(cert, mode);
|
|
|
|
QObject::connect(fetcher, SIGNAL(finished(QSslCertificate,QSslCertificate)), q, SLOT(_q_caRootLoaded(QSslCertificate,QSslCertificate)), Qt::QueuedConnection);
|
|
|
|
QMetaObject::invokeMethod(fetcher, "start", Qt::QueuedConnection);
|
|
|
|
pauseSocketNotifiers(q);
|
|
|
|
paused = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//This is the callback from QWindowsCaRootFetcher, trustedRoot will be invalid (default constructed) if it failed.
|
|
|
|
void QSslSocketBackendPrivate::_q_caRootLoaded(QSslCertificate cert, QSslCertificate trustedRoot)
|
|
|
|
{
|
|
|
|
Q_Q(QSslSocket);
|
2012-05-21 14:19:50 +00:00
|
|
|
if (!trustedRoot.isNull() && !trustedRoot.isBlacklisted()) {
|
2012-03-23 11:01:42 +00:00
|
|
|
if (s_loadRootCertsOnDemand) {
|
|
|
|
//Add the new root cert to default cert list for use by future sockets
|
|
|
|
QSslSocket::addDefaultCaCertificate(trustedRoot);
|
|
|
|
}
|
|
|
|
//Add the new root cert to this socket for future connections
|
|
|
|
q->addCaCertificate(trustedRoot);
|
|
|
|
//Remove the broken chain ssl errors (as chain is verified by windows)
|
|
|
|
for (int i=sslErrors.count() - 1; i >= 0; --i) {
|
|
|
|
if (sslErrors.at(i).certificate() == cert) {
|
|
|
|
switch (sslErrors.at(i).error()) {
|
|
|
|
case QSslError::UnableToGetLocalIssuerCertificate:
|
|
|
|
case QSslError::CertificateUntrusted:
|
|
|
|
case QSslError::UnableToVerifyFirstCertificate:
|
2012-04-27 19:05:05 +00:00
|
|
|
case QSslError::SelfSignedCertificateInChain:
|
2012-03-23 11:01:42 +00:00
|
|
|
// error can be ignored if OS says the chain is trusted
|
|
|
|
sslErrors.removeAt(i);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
// error cannot be ignored
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Continue with remaining errors
|
|
|
|
if (plainSocket)
|
|
|
|
plainSocket->resume();
|
|
|
|
paused = false;
|
2016-03-01 20:10:04 +00:00
|
|
|
if (checkSslErrors() && ssl) {
|
|
|
|
bool willClose = (autoStartHandshake && pendingClose);
|
2012-03-23 11:01:42 +00:00
|
|
|
continueHandshake();
|
2016-03-01 20:10:04 +00:00
|
|
|
if (!willClose)
|
|
|
|
transmit();
|
|
|
|
}
|
2012-03-23 11:01:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
class QWindowsCaRootFetcherThread : public QThread
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
QWindowsCaRootFetcherThread()
|
|
|
|
{
|
|
|
|
qRegisterMetaType<QSslCertificate>();
|
|
|
|
setObjectName(QStringLiteral("QWindowsCaRootFetcher"));
|
|
|
|
start();
|
|
|
|
}
|
|
|
|
~QWindowsCaRootFetcherThread()
|
|
|
|
{
|
|
|
|
quit();
|
|
|
|
wait(15500); // worst case, a running request can block for 15 seconds
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Q_GLOBAL_STATIC(QWindowsCaRootFetcherThread, windowsCaRootFetcherThread);
|
|
|
|
|
|
|
|
QWindowsCaRootFetcher::QWindowsCaRootFetcher(const QSslCertificate &certificate, QSslSocket::SslMode sslMode)
|
|
|
|
: cert(certificate), mode(sslMode)
|
|
|
|
{
|
|
|
|
moveToThread(windowsCaRootFetcherThread());
|
|
|
|
}
|
|
|
|
|
|
|
|
QWindowsCaRootFetcher::~QWindowsCaRootFetcher()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
void QWindowsCaRootFetcher::start()
|
|
|
|
{
|
|
|
|
QByteArray der = cert.toDer();
|
|
|
|
PCCERT_CONTEXT wincert = CertCreateCertificateContext(X509_ASN_ENCODING, (const BYTE *)der.constData(), der.length());
|
|
|
|
if (!wincert) {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl, "QWindowsCaRootFetcher failed to convert certificate to windows form");
|
2012-03-23 11:01:42 +00:00
|
|
|
#endif
|
|
|
|
emit finished(cert, QSslCertificate());
|
|
|
|
deleteLater();
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
CERT_CHAIN_PARA parameters;
|
|
|
|
memset(¶meters, 0, sizeof(parameters));
|
|
|
|
parameters.cbSize = sizeof(parameters);
|
|
|
|
// set key usage constraint
|
|
|
|
parameters.RequestedUsage.dwType = USAGE_MATCH_TYPE_AND;
|
|
|
|
parameters.RequestedUsage.Usage.cUsageIdentifier = 1;
|
2012-04-18 01:54:30 +00:00
|
|
|
LPSTR oid = (LPSTR)(mode == QSslSocket::SslClientMode ? szOID_PKIX_KP_SERVER_AUTH : szOID_PKIX_KP_CLIENT_AUTH);
|
2012-03-23 11:01:42 +00:00
|
|
|
parameters.RequestedUsage.Usage.rgpszUsageIdentifier = &oid;
|
|
|
|
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
|
|
|
QElapsedTimer stopwatch;
|
|
|
|
stopwatch.start();
|
|
|
|
#endif
|
|
|
|
PCCERT_CHAIN_CONTEXT chain;
|
|
|
|
BOOL result = CertGetCertificateChain(
|
|
|
|
0, //default engine
|
|
|
|
wincert,
|
|
|
|
0, //current date/time
|
|
|
|
0, //default store
|
|
|
|
¶meters,
|
|
|
|
0, //default dwFlags
|
|
|
|
0, //reserved
|
|
|
|
&chain);
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QWindowsCaRootFetcher" << stopwatch.elapsed() << "ms to get chain";
|
2012-03-23 11:01:42 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
QSslCertificate trustedRoot;
|
|
|
|
if (result) {
|
|
|
|
#ifdef QSSLSOCKET_DEBUG
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << "QWindowsCaRootFetcher - examining windows chains";
|
2012-03-23 11:01:42 +00:00
|
|
|
if (chain->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR)
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - TRUSTED";
|
2012-03-23 11:01:42 +00:00
|
|
|
else
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - NOT TRUSTED" << chain->TrustStatus.dwErrorStatus;
|
2012-03-23 11:01:42 +00:00
|
|
|
if (chain->TrustStatus.dwInfoStatus & CERT_TRUST_IS_SELF_SIGNED)
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - SELF SIGNED";
|
|
|
|
qCDebug(lcSsl) << "QSslSocketBackendPrivate::fetchCaRootForCert - dumping simple chains";
|
2012-03-23 11:01:42 +00:00
|
|
|
for (unsigned int i = 0; i < chain->cChain; i++) {
|
|
|
|
if (chain->rgpChain[i]->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR)
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - TRUSTED SIMPLE CHAIN" << i;
|
2012-03-23 11:01:42 +00:00
|
|
|
else
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - UNTRUSTED SIMPLE CHAIN" << i << "reason:" << chain->rgpChain[i]->TrustStatus.dwErrorStatus;
|
2012-03-23 11:01:42 +00:00
|
|
|
for (unsigned int j = 0; j < chain->rgpChain[i]->cElement; j++) {
|
|
|
|
QSslCertificate foundCert(QByteArray((const char *)chain->rgpChain[i]->rgpElement[j]->pCertContext->pbCertEncoded
|
|
|
|
, chain->rgpChain[i]->rgpElement[j]->pCertContext->cbCertEncoded), QSsl::Der);
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - " << foundCert;
|
2012-03-23 11:01:42 +00:00
|
|
|
}
|
|
|
|
}
|
2014-12-08 12:35:47 +00:00
|
|
|
qCDebug(lcSsl) << " - and" << chain->cLowerQualityChainContext << "low quality chains"; //expect 0, we haven't asked for them
|
2012-03-23 11:01:42 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
//based on http://msdn.microsoft.com/en-us/library/windows/desktop/aa377182%28v=vs.85%29.aspx
|
|
|
|
//about the final chain rgpChain[cChain-1] which must begin with a trusted root to be valid
|
|
|
|
if (chain->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR
|
|
|
|
&& chain->cChain > 0) {
|
|
|
|
const PCERT_SIMPLE_CHAIN finalChain = chain->rgpChain[chain->cChain - 1];
|
|
|
|
// http://msdn.microsoft.com/en-us/library/windows/desktop/aa377544%28v=vs.85%29.aspx
|
|
|
|
// rgpElement[0] is the end certificate chain element. rgpElement[cElement-1] is the self-signed "root" certificate element.
|
|
|
|
if (finalChain->TrustStatus.dwErrorStatus == CERT_TRUST_NO_ERROR
|
|
|
|
&& finalChain->cElement > 0) {
|
|
|
|
trustedRoot = QSslCertificate(QByteArray((const char *)finalChain->rgpElement[finalChain->cElement - 1]->pCertContext->pbCertEncoded
|
|
|
|
, finalChain->rgpElement[finalChain->cElement - 1]->pCertContext->cbCertEncoded), QSsl::Der);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
CertFreeCertificateChain(chain);
|
|
|
|
}
|
|
|
|
CertFreeCertificateContext(wincert);
|
|
|
|
|
|
|
|
emit finished(cert, trustedRoot);
|
|
|
|
deleteLater();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
void QSslSocketBackendPrivate::disconnectFromHost()
|
|
|
|
{
|
|
|
|
if (ssl) {
|
2013-04-04 09:30:43 +00:00
|
|
|
if (!shutdown) {
|
|
|
|
q_SSL_shutdown(ssl);
|
|
|
|
shutdown = true;
|
|
|
|
transmit();
|
|
|
|
}
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
plainSocket->disconnectFromHost();
|
|
|
|
}
|
|
|
|
|
|
|
|
void QSslSocketBackendPrivate::disconnected()
|
|
|
|
{
|
2012-01-30 15:52:27 +00:00
|
|
|
if (plainSocket->bytesAvailable() <= 0)
|
|
|
|
destroySslContext();
|
2015-06-19 13:35:34 +00:00
|
|
|
else {
|
|
|
|
// Move all bytes into the plain buffer
|
|
|
|
qint64 tmpReadBufferMaxSize = readBufferMaxSize;
|
|
|
|
readBufferMaxSize = 0; // reset temporarily so the plain socket buffer is completely drained
|
|
|
|
transmit();
|
|
|
|
readBufferMaxSize = tmpReadBufferMaxSize;
|
|
|
|
}
|
2012-01-30 15:52:27 +00:00
|
|
|
//if there is still buffered data in the plain socket, don't destroy the ssl context yet.
|
|
|
|
//it will be destroyed when the socket is deleted.
|
2011-04-27 10:05:43 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
QSslCipher QSslSocketBackendPrivate::sessionCipher() const
|
|
|
|
{
|
2012-12-21 13:02:38 +00:00
|
|
|
if (!ssl)
|
2011-04-27 10:05:43 +00:00
|
|
|
return QSslCipher();
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
|
|
|
|
const SSL_CIPHER *sessionCipher = q_SSL_get_current_cipher(ssl);
|
2011-04-27 10:05:43 +00:00
|
|
|
return sessionCipher ? QSslCipher_from_SSL_CIPHER(sessionCipher) : QSslCipher();
|
|
|
|
}
|
|
|
|
|
2014-03-10 13:00:08 +00:00
|
|
|
QSsl::SslProtocol QSslSocketBackendPrivate::sessionProtocol() const
|
|
|
|
{
|
|
|
|
if (!ssl)
|
|
|
|
return QSsl::UnknownProtocol;
|
|
|
|
int ver = q_SSL_version(ssl);
|
|
|
|
|
|
|
|
switch (ver) {
|
|
|
|
case 0x2:
|
|
|
|
return QSsl::SslV2;
|
|
|
|
case 0x300:
|
|
|
|
return QSsl::SslV3;
|
|
|
|
case 0x301:
|
|
|
|
return QSsl::TlsV1_0;
|
|
|
|
case 0x302:
|
|
|
|
return QSsl::TlsV1_1;
|
|
|
|
case 0x303:
|
|
|
|
return QSsl::TlsV1_2;
|
|
|
|
}
|
|
|
|
|
|
|
|
return QSsl::UnknownProtocol;
|
|
|
|
}
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
QList<QSslCertificate> QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(STACK_OF(X509) *x509)
|
|
|
|
{
|
|
|
|
ensureInitialized();
|
|
|
|
QList<QSslCertificate> certificates;
|
|
|
|
for (int i = 0; i < q_sk_X509_num(x509); ++i) {
|
|
|
|
if (X509 *entry = q_sk_X509_value(x509, i))
|
|
|
|
certificates << QSslCertificatePrivate::QSslCertificate_from_X509(entry);
|
|
|
|
}
|
|
|
|
return certificates;
|
|
|
|
}
|
|
|
|
|
2015-01-23 09:11:18 +00:00
|
|
|
QList<QSslError> QSslSocketBackendPrivate::verify(const QList<QSslCertificate> &certificateChain, const QString &hostName)
|
2011-06-18 14:53:53 +00:00
|
|
|
{
|
|
|
|
QList<QSslError> errors;
|
|
|
|
if (certificateChain.count() <= 0) {
|
|
|
|
errors << QSslError(QSslError::UnspecifiedError);
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Setup the store with the default CA certificates
|
|
|
|
X509_STORE *certStore = q_X509_STORE_new();
|
|
|
|
if (!certStore) {
|
2014-12-08 12:35:47 +00:00
|
|
|
qCWarning(lcSsl) << "Unable to create certificate store";
|
2011-06-18 14:53:53 +00:00
|
|
|
errors << QSslError(QSslError::UnspecifiedError);
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
2012-02-21 14:28:18 +00:00
|
|
|
if (s_loadRootCertsOnDemand) {
|
|
|
|
setDefaultCaCertificates(defaultCaCertificates() + systemCaCertificates());
|
|
|
|
}
|
|
|
|
|
2015-10-23 14:32:59 +00:00
|
|
|
const QDateTime now = QDateTime::currentDateTimeUtc();
|
2016-01-26 13:38:54 +00:00
|
|
|
const auto caCertificates = QSslConfiguration::defaultConfiguration().caCertificates();
|
|
|
|
for (const QSslCertificate &caCertificate : caCertificates) {
|
2014-05-01 22:10:21 +00:00
|
|
|
// From https://www.openssl.org/docs/ssl/SSL_CTX_load_verify_locations.html:
|
|
|
|
//
|
|
|
|
// If several CA certificates matching the name, key identifier, and
|
|
|
|
// serial number condition are available, only the first one will be
|
|
|
|
// examined. This may lead to unexpected results if the same CA
|
|
|
|
// certificate is available with different expiration dates. If a
|
|
|
|
// ``certificate expired'' verification error occurs, no other
|
|
|
|
// certificate will be searched. Make sure to not have expired
|
|
|
|
// certificates mixed with valid ones.
|
|
|
|
//
|
|
|
|
// See also: QSslContext::fromConfiguration()
|
2015-10-23 14:32:59 +00:00
|
|
|
if (caCertificate.expiryDate() >= now) {
|
2011-08-31 17:35:36 +00:00
|
|
|
q_X509_STORE_add_cert(certStore, reinterpret_cast<X509 *>(caCertificate.handle()));
|
2011-06-18 14:53:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-14 09:28:32 +00:00
|
|
|
QMutexLocker sslErrorListMutexLocker(&_q_sslErrorList()->mutex);
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
// Register a custom callback to get all verification errors.
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
q_X509_STORE_set_verify_cb(certStore, q_X509Callback);
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
// Build the chain of intermediate certificates
|
|
|
|
STACK_OF(X509) *intermediates = 0;
|
|
|
|
if (certificateChain.length() > 1) {
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
intermediates = (STACK_OF(X509) *) q_OPENSSL_sk_new_null();
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
if (!intermediates) {
|
|
|
|
q_X509_STORE_free(certStore);
|
|
|
|
errors << QSslError(QSslError::UnspecifiedError);
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool first = true;
|
2016-01-26 13:38:54 +00:00
|
|
|
for (const QSslCertificate &cert : certificateChain) {
|
2011-06-18 14:53:53 +00:00
|
|
|
if (first) {
|
|
|
|
first = false;
|
|
|
|
continue;
|
|
|
|
}
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
|
|
|
|
q_OPENSSL_sk_push((OPENSSL_STACK *)intermediates, reinterpret_cast<X509 *>(cert.handle()));
|
2011-06-18 14:53:53 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
X509_STORE_CTX *storeContext = q_X509_STORE_CTX_new();
|
|
|
|
if (!storeContext) {
|
|
|
|
q_X509_STORE_free(certStore);
|
|
|
|
errors << QSslError(QSslError::UnspecifiedError);
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
2011-08-31 17:35:36 +00:00
|
|
|
if (!q_X509_STORE_CTX_init(storeContext, certStore, reinterpret_cast<X509 *>(certificateChain[0].handle()), intermediates)) {
|
2011-06-18 14:53:53 +00:00
|
|
|
q_X509_STORE_CTX_free(storeContext);
|
|
|
|
q_X509_STORE_free(certStore);
|
|
|
|
errors << QSslError(QSslError::UnspecifiedError);
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Now we can actually perform the verification of the chain we have built.
|
|
|
|
// We ignore the result of this function since we process errors via the
|
|
|
|
// callback.
|
|
|
|
(void) q_X509_verify_cert(storeContext);
|
|
|
|
|
|
|
|
q_X509_STORE_CTX_free(storeContext);
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
q_OPENSSL_sk_free((OPENSSL_STACK *)intermediates);
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
// Now process the errors
|
2016-01-17 13:16:43 +00:00
|
|
|
const auto errorList = std::move(_q_sslErrorList()->errors);
|
2011-06-18 14:53:53 +00:00
|
|
|
_q_sslErrorList()->errors.clear();
|
|
|
|
|
2011-07-14 09:28:32 +00:00
|
|
|
sslErrorListMutexLocker.unlock();
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
// Translate the errors
|
|
|
|
if (QSslCertificatePrivate::isBlacklisted(certificateChain[0])) {
|
|
|
|
QSslError error(QSslError::CertificateBlacklisted, certificateChain[0]);
|
|
|
|
errors << error;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check the certificate name against the hostname if one was specified
|
|
|
|
if ((!hostName.isEmpty()) && (!isMatchingHostname(certificateChain[0], hostName))) {
|
|
|
|
// No matches in common names or alternate names.
|
|
|
|
QSslError error(QSslError::HostNameMismatch, certificateChain[0]);
|
|
|
|
errors << error;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Translate errors from the error list into QSslErrors.
|
2016-01-17 13:16:43 +00:00
|
|
|
errors.reserve(errors.size() + errorList.size());
|
|
|
|
for (const auto &error : qAsConst(errorList))
|
|
|
|
errors << _q_OpenSSL_to_QSslError(error.code, certificateChain.value(error.depth));
|
2011-06-18 14:53:53 +00:00
|
|
|
|
|
|
|
q_X509_STORE_free(certStore);
|
|
|
|
|
|
|
|
return errors;
|
|
|
|
}
|
|
|
|
|
2014-11-21 11:44:33 +00:00
|
|
|
bool QSslSocketBackendPrivate::importPkcs12(QIODevice *device,
|
2014-05-10 21:49:37 +00:00
|
|
|
QSslKey *key, QSslCertificate *cert,
|
|
|
|
QList<QSslCertificate> *caCertificates,
|
|
|
|
const QByteArray &passPhrase)
|
|
|
|
{
|
|
|
|
if (!supportsSsl())
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// These are required
|
|
|
|
Q_ASSERT(device);
|
|
|
|
Q_ASSERT(key);
|
|
|
|
Q_ASSERT(cert);
|
|
|
|
|
|
|
|
// Read the file into a BIO
|
|
|
|
QByteArray pkcs12data = device->readAll();
|
|
|
|
if (pkcs12data.size() == 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
BIO *bio = q_BIO_new_mem_buf(const_cast<char *>(pkcs12data.constData()), pkcs12data.size());
|
|
|
|
|
|
|
|
// Create the PKCS#12 object
|
|
|
|
PKCS12 *p12 = q_d2i_PKCS12_bio(bio, 0);
|
|
|
|
if (!p12) {
|
2014-12-08 12:35:47 +00:00
|
|
|
qCWarning(lcSsl, "Unable to read PKCS#12 structure, %s", q_ERR_error_string(q_ERR_get_error(), 0));
|
2014-05-10 21:49:37 +00:00
|
|
|
q_BIO_free(bio);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Extract the data
|
2017-08-07 10:49:59 +00:00
|
|
|
EVP_PKEY *pkey = nullptr;
|
2014-05-10 21:49:37 +00:00
|
|
|
X509 *x509;
|
|
|
|
STACK_OF(X509) *ca = 0;
|
|
|
|
|
|
|
|
if (!q_PKCS12_parse(p12, passPhrase.constData(), &pkey, &x509, &ca)) {
|
2014-12-08 12:35:47 +00:00
|
|
|
qCWarning(lcSsl, "Unable to parse PKCS#12 structure, %s", q_ERR_error_string(q_ERR_get_error(), 0));
|
2014-05-10 21:49:37 +00:00
|
|
|
q_PKCS12_free(p12);
|
|
|
|
q_BIO_free(bio);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Convert to Qt types
|
|
|
|
if (!key->d->fromEVP_PKEY(pkey)) {
|
2014-12-08 12:35:47 +00:00
|
|
|
qCWarning(lcSsl, "Unable to convert private key");
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca),
|
|
|
|
reinterpret_cast<void (*)(void *)>(q_OPENSSL_sk_free));
|
2014-05-10 21:49:37 +00:00
|
|
|
q_X509_free(x509);
|
|
|
|
q_EVP_PKEY_free(pkey);
|
|
|
|
q_PKCS12_free(p12);
|
|
|
|
q_BIO_free(bio);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
*cert = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
|
|
|
|
|
|
|
|
if (caCertificates)
|
|
|
|
*caCertificates = QSslSocketBackendPrivate::STACKOFX509_to_QSslCertificates(ca);
|
|
|
|
|
|
|
|
// Clean up
|
QSslSocket: OpenSSL 1.1 backend
This patch-set implements a new QSslSocket backend based on OpenSSL 1.1.
1. General.
The code in this patch was organized to achieve these (somewhat contradicting)
objectives:
- keep the new code free of #if-ery, as far as possible;
- make it easy to clean away dead code when we're eventually able to retire
out-dated OpenSSL versions;
- reduce the amount of code duplication.
If changes in some file/component were insignificant (~5 one-liners per file),
we still use pp-checks like: #if QT_CONFIG(opensslv11) ... #else ... #endif -
the logic is simple and it's still easy to clean the code if we remove the legacy
back-end. Where it saved #if-ery, we also introduced 'forward-compatible'
macros implementing equivalents of 1.1 functions using older OpenSSL.
In case some class contains a lot of version-specific ifdefs (particularly where
nested #if-ery was complex) we choose to split code into: "pre11" h/cpp files,
"shared" h/cpp files (they preserve their original names, e.g qsslsocket_openssl.cpp)
and "11" h/cpp files. If in future we remove the legacy back-end, "pre11" should be
removed; "shared" and "11" parts - merged.
2. Configuration.
We introduced a new feature 'opensslv11' which complements the pre-existing
'openssl' and 'openssl-linked' features. The 'opensslv11' feature is enabled
by a simple test which either compiles successfully or ends in a compilation
error, depending on a value of the OPENSSL_VERSION_NUMBER constant. If the
feature was enabled, we also append an additional compilation flag
-DOPENSSL_API_COMPAT=0x10100000L to make sure our new code does not contain
deprecated structures, function calls, macro-invocations from OpenSSL < 1.1.
Change-Id: I2064efbe9685def5d2bb2233a66f7581954fb74a
Reviewed-by: André Klitzing <aklitzing@gmail.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2017-03-23 11:43:22 +00:00
|
|
|
// TODO: verify ASAP, in the past we had sk_pop_free with q_OPENSSL_sk_free
|
|
|
|
// which seems to be blatantly wrong and even crashes with 1.1.
|
|
|
|
q_OPENSSL_sk_pop_free(reinterpret_cast<OPENSSL_STACK *>(ca),
|
|
|
|
reinterpret_cast<void (*)(void *)>(q_X509_free));
|
|
|
|
|
2014-05-10 21:49:37 +00:00
|
|
|
q_X509_free(x509);
|
|
|
|
q_EVP_PKEY_free(pkey);
|
|
|
|
q_PKCS12_free(p12);
|
|
|
|
q_BIO_free(bio);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-04-27 10:05:43 +00:00
|
|
|
QT_END_NAMESPACE
|