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/qsslconfiguration_p.h | |
| 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/qsslconfiguration_p.h')
| -rw-r--r-- | src/network/ssl/qsslconfiguration_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h index f44485d51a..6c23165c6a 100644 --- a/src/network/ssl/qsslconfiguration_p.h +++ b/src/network/ssl/qsslconfiguration_p.h @@ -137,7 +137,11 @@ public: QByteArray nextNegotiatedProtocol; QSslConfiguration::NextProtocolNegotiationStatus nextProtocolNegotiationStatus; +#if QT_CONFIG(dtls) bool dtlsCookieEnabled = true; +#else + const bool dtlsCookieEnabled = false; +#endif // dtls // in qsslsocket.cpp: static QSslConfiguration defaultConfiguration(); |