diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-06-25 16:30:36 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2018-07-13 04:50:38 +0000 |
| commit | d74ced697e96cf89ad382ccc5f730f55df955c36 (patch) | |
| tree | d21dd386b9b6a0d3cd8596332ce240a0a301930e /src/network/ssl/qsslsocket_openssl.cpp | |
| parent | 58065cedf753032477487799845b4414a6476a39 (diff) | |
Extend the feature 'dtls' to handle missing DTLS support in OpenSSL
OpenSSL has 'no-dtls' configure option (or can be too ancient to properly
support it), we shall respect such builds. This patch extends configure.json
with a 'dtls' test and adds protection against linkage/compile-time
issues in the QtNetwork's code.
Change-Id: I0c0dd94f5c226115cee4285b82c83aa546555aea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl.cpp')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp index e8dd6c8c5b..038d32ae13 100644 --- a/src/network/ssl/qsslsocket_openssl.cpp +++ b/src/network/ssl/qsslsocket_openssl.cpp @@ -487,9 +487,9 @@ void QSslSocketPrivate::resetDefaultCiphers() setDefaultSupportedCiphers(ciphers); setDefaultCiphers(defaultCiphers); +#if QT_CONFIG(dtls) ciphers.clear(); defaultCiphers.clear(); - myCtx = q_SSL_CTX_new(q_DTLS_client_method()); if (myCtx) { mySsl = q_SSL_new(myCtx); @@ -500,6 +500,7 @@ void QSslSocketPrivate::resetDefaultCiphers() } q_SSL_CTX_free(myCtx); } +#endif // dtls } void QSslSocketPrivate::resetDefaultEllipticCurves() |