From d385158d5213ef568b7629e2aa4a818016bbffac Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 25 Mar 2021 12:41:08 +0100 Subject: Move plugin code from QtNetwork to qtbase/plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All TLS (and non-TLS) backends that QSsl classes rely on are now in plugins/tls (as openssl, securetransport, schannel and certonly plugins). For now, I have to disable some tests that were using OpenSSL calls - this to be refactored/re-thought. These include: qsslsocket auto-test (test-case where we work with private keys), qsslkey auto-test (similar to qsslsocket - test-case working with keys using OpenSSL calls). qasn1element moved to plugins too, so its auto-test have to be re-thought. Since now we can have more than one working TLS-backend on a given platform, the presence of OpenSSL also means I force this backend as active before running tests, to make sure features implemented only in OpenSSL-backend are tested. OCSP auto test is disabled for now, since it heavily relies on OpenSSL symbols (to be refactored). [ChangeLog][QtNetwork][QSslSocket] QSslSocket by default prefers 'openssl' backend if it is available. [ChangeLog][QtNetwork][QSslSocket] TLS-backends are not mutually exclusive anymore, depending on a platform, more than one TLS backend can be built. E.g., configuring Qt with -openssl does not prevent SecureTransport or Schannel plugin from being built. Fixes: QTBUG-91928 Change-Id: I4c05e32f10179066bee3a518bdfdd6c4b15320c3 Reviewed-by: Qt CI Bot Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- src/network/configure.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/configure.json') diff --git a/src/network/configure.json b/src/network/configure.json index d1ee15d80b..01dd855a1c 100644 --- a/src/network/configure.json +++ b/src/network/configure.json @@ -284,13 +284,13 @@ "autoDetect": "!config.wasm", "enable": "input.openssl == 'yes' || input.openssl == 'runtime'", "disable": "input.openssl == 'no' || input.openssl == 'linked' || input.ssl == 'no'", - "condition": "!features.securetransport && !features.schannel && libs.openssl_headers" + "condition": "libs.openssl_headers" }, "openssl-linked": { "label": " Qt directly linked to OpenSSL", "autoDetect": false, "enable": "input.openssl == 'linked'", - "condition": "!features.securetransport && !features.schannel && libs.openssl", + "condition": "libs.openssl", "output": [ "privateFeature", { "type": "define", "name": "QT_LINKED_OPENSSL" } @@ -299,7 +299,7 @@ "securetransport": { "label": "SecureTransport", "disable": "input.ssl == 'no'", - "condition": "config.darwin && (input.openssl == '' || input.openssl == 'no')", + "condition": "config.darwin", "output": [ "publicFeature", { "type": "define", "name": "QT_SECURETRANSPORT" } @@ -309,7 +309,7 @@ "label": "Schannel", "autoDetect": false, "disable": "input.ssl == 'no'", - "condition": "config.win32 && (input.openssl == '' || input.openssl == 'no')", + "condition": "config.win32", "output": [ "publicFeature", { "type": "define", "name": "QT_SCHANNEL" } -- cgit v1.2.3