diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2017-05-23 14:47:14 +0200 |
|---|---|---|
| committer | Lars Schmertmann <lars.schmertmann@governikus.de> | 2018-01-26 11:34:02 +0000 |
| commit | f55c73ede28d4455f555a28e401407326ac9b954 (patch) | |
| tree | c6c0836be78ba465051225cd38e7ec602aeeec8b /src/network/ssl/qsslcontext_openssl11.cpp | |
| parent | dcfb6f9d18beb397517ecc31ad462f1f4ebb8859 (diff) | |
Introduce QSslConfiguration::backendConfig
With this change it is possible to use all supported
configurations in different backends without any new interfaces.
Change-Id: Ib233539a970681d30ae3907258730e491f8d3531
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/ssl/qsslcontext_openssl11.cpp')
| -rw-r--r-- | src/network/ssl/qsslcontext_openssl11.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslcontext_openssl11.cpp b/src/network/ssl/qsslcontext_openssl11.cpp index 787b6ae3f5..7be7be46b8 100644 --- a/src/network/ssl/qsslcontext_openssl11.cpp +++ b/src/network/ssl/qsslcontext_openssl11.cpp @@ -260,6 +260,7 @@ init_context: #ifdef OPENSSL_NO_EC sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version with disabled elliptic curves")); sslContext->errorCode = QSslError::UnspecifiedError; + return; #else // Set the curves to be used. std::vector<int> curves; @@ -269,9 +270,12 @@ init_context: if (!q_SSL_CTX_ctrl(sslContext->ctx, SSL_CTRL_SET_CURVES, long(curves.size()), &curves[0])) { sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl()); sslContext->errorCode = QSslError::UnspecifiedError; + return; } #endif } + + applyBackendConfig(sslContext); } QT_END_NAMESPACE |