diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-09-27 13:04:54 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2019-11-01 14:52:09 +0100 |
| commit | 1a878e65c21be10c7c64839ebf6f2b27170feb00 (patch) | |
| tree | 33bc8f7754d4af9593e5ebf15e9faa0be579ed8b /src/network/ssl/qsslsocket_openssl_p.h | |
| parent | 7a13a091161851b7fa38d838d3c6ef3a96e19422 (diff) | |
QSslSocket - remove old OpenSSL backend (< 1.1)
OpenSSL 1.0.2 will stop receiving all support at the end
of 2019. Qt 5.15 is our next LTS thus makes sense remove
OpenSSL 1.0.2 support there. This also allows us quite
a significant cleanup of an old heavily if-defed code
and all 'pre11' suffixed source files.
[ChangeLog][QtNetwork][SSL] Removed OpenSSL 1.0.x support, now 1.1.x is required
Change-Id: I70c70c56cbd8aeff793afe793335696d1b1b7408
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index c23234e291..0370a7d2ac 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -130,9 +130,7 @@ public: BIO *writeBio; SSL_SESSION *session; QVector<QSslErrorEntry> errorList; -#if OPENSSL_VERSION_NUMBER >= 0x10001000L static int s_indexForSSLExtraData; // index used in SSL_get_ex_data to get the matching QSslSocketBackendPrivate -#endif bool inSetAndEmitError = false; |