diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-22 13:45:07 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2021-02-25 18:44:17 +0100 |
| commit | 41fc143635c25f937a557f09890601f6c7d38736 (patch) | |
| tree | 26b3b9ab137b60f6ab0f90f7b878a132f1247b72 /src/network/CMakeLists.txt | |
| parent | 0ea39a7c42c923b107ae5057562b4a831f72d01d (diff) | |
Move QSslCertificate's details and cert-related code to the plugins
Also since we have to properly support 'no-ssl' configure option
(alas, we support QSslCertificate on such builds) - introduce
a minimal crippled QTlsBackendCertOnly, which depends on
X509CertificateGeneric.
Pick-to: dev
Fixes: QTBUG-90954
Task-number: QTBUG-65922
Change-Id: Ib9d62903f16b7c0eaaa23e319a822c24a7631dc6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/network/CMakeLists.txt')
| -rw-r--r-- | src/network/CMakeLists.txt | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 3ba4ef6015..03fc8ab879 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -47,6 +47,10 @@ qt_internal_add_module(Network ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h ssl/qtls_utils_p.h + ssl/qtlsbackend.cpp ssl/qtlsbackend_p.h + ssl/qtlsbackend_cert.cpp ssl/qtlsbackend_cert_p.h + ssl/qx509_base.cpp ssl/qx509_base_p.h + ssl/qx509_generic.cpp ssl/qx509_generic_p.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -310,11 +314,6 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_system_proxies QT_USE_SYSTEM_PROXIES ) -qt_internal_extend_target(Network CONDITION NOT QT_FEATURE_openssl - SOURCES - ssl/qsslcertificate_qt.cpp -) - qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl SOURCES ssl/qocspresponse.cpp ssl/qocspresponse.h ssl/qocspresponse_p.h @@ -326,14 +325,11 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_ssl ssl/qsslkey.h ssl/qsslkey_p.cpp ssl/qsslkey_p.h ssl/qsslpresharedkeyauthenticator.cpp ssl/qsslpresharedkeyauthenticator.h ssl/qsslpresharedkeyauthenticator_p.h ssl/qsslsocket.cpp ssl/qsslsocket.h ssl/qsslsocket_p.h - ssl/qtlsbackend.cpp ssl/qtlsbackend_p.h ssl/qtlskey_base.cpp ssl/qtlskey_base_p.h - ssl/qx509_base.cpp ssl/qx509_base_p.h ) qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_ssl SOURCES - ssl/qsslcertificate_schannel.cpp ssl/qssldiffiehellmanparameters_dummy.cpp ssl/qsslellipticcurve_dummy.cpp ssl/qsslsocket_qt.cpp @@ -341,7 +337,6 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_schannel AND QT_FEATURE_s ssl/qtlsbackend_schannel_p.h ssl/qtlskey_generic.cpp ssl/qtlskey_generic_p.h ssl/qtlskey_schannel.cpp ssl/qtlskey_schannel_p.h - ssl/qx509_generic.cpp ssl/qx509_generic_p.h ssl/qx509_schannel.cpp ssl/qx509_schannel_p.h LIBRARIES Crypt32 @@ -360,7 +355,6 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_securetransport AND QT_FE ssl/qtlskey_generic.cpp ssl/qtlskey_generic_p.h ssl/qtlskey_st.cpp ssl/qtlskey_st_p.h ssl/qtlsbackend_st.cpp ssl/qtlsbackend_st_p.h - ssl/qx509_generic.cpp ssl/qx509_generic_p.h ssl/qx509_st.cpp ssl/qx509_st_p.h ) @@ -371,7 +365,6 @@ qt_internal_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_ssl qt_internal_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl SOURCES - ssl/qsslcertificate_openssl.cpp ssl/qsslcontext_openssl.cpp ssl/qsslcontext_openssl_p.h ssl/qssldiffiehellmanparameters_openssl.cpp ssl/qsslellipticcurve_openssl.cpp |