From 1a878e65c21be10c7c64839ebf6f2b27170feb00 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Fri, 27 Sep 2019 13:04:54 +0200 Subject: QSslSocket - remove old OpenSSL backend (< 1.1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mårten Nordheim --- src/network/configure.json | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'src/network/configure.json') diff --git a/src/network/configure.json b/src/network/configure.json index f501465c91..6bc71469dc 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -61,11 +61,11 @@ "export": "openssl", "test": { "tail": [ - "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10000000L", - "# error OpenSSL >= 1.0.0 is required", + "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", + "# error OpenSSL >= 1.1.0 is required", "#endif", - "#if OPENSSL_VERSION_NUMBER-0 >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)", - "# error OpenSSL was reported as >= 1.0.2 but is missing required features, possibly it's libressl which is unsupported", + "#if !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)", + "# error OpenSSL was reported as >= 1.1.0 but is missing required features, possibly it's libressl which is unsupported", "#endif" ] }, @@ -185,19 +185,6 @@ }, "use": "network" }, - "openssl11": { - "label": "OpenSSL 1.1 support", - "type": "compile", - "test": { - "include": "openssl/opensslv.h", - "tail": [ - "#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L", - "# error OpenSSL >= 1.1 is required", - "#endif" - ] - }, - "use": "openssl" - }, "dtls": { "label": "DTLS support in OpenSSL", "type": "compile", @@ -335,7 +322,7 @@ }, "opensslv11": { "label": "OpenSSL 1.1", - "condition": "features.openssl && tests.openssl11", + "condition": "features.openssl", "output": [ "publicFeature" ] }, "sctp": { -- cgit v1.2.3