From: Viktor Szakats Date: Fri, 14 Feb 2025 21:38:15 +0000 (+0100) Subject: cmake: drop two stray TLS feature checks for wolfSSL X-Git-Tag: curl-8_13_0~475 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2533df62399fd4f8767fc89ef04eef203e71d163;p=thirdparty%2Fcurl.git cmake: drop two stray TLS feature checks for wolfSSL Drop check for `SSL_set0_wbio`, `SSL_CTX_set_srp_username`. The wolfSSL backend doesn't implement these features. The checks were wrong, and also missing from `./configure`. If they get implemented, the feature checks should use distinct macros from OpenSSL; they should check for the `wolfSSL_`-prefixed APIs via wolfSSL headers; and matching checks should be added to `./configure`. Follow-up to 781242ffa44a9f9b95b6da5ac5a1bf6372ec6257 #11967 #11964 Closes #16339 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 33693fe33f..93009ef65d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,8 +32,8 @@ # https://cmake.org/cmake/help/latest/module/FetchContent.html#integrating-with-find-package # # The following variables are available: -# HAVE_SSL_SET0_WBIO: `SSL_set0_wbio` present in OpenSSL/wolfSSL -# HAVE_OPENSSL_SRP: `SSL_CTX_set_srp_username` present in OpenSSL/wolfSSL +# HAVE_SSL_SET0_WBIO: `SSL_set0_wbio` present in OpenSSL +# HAVE_OPENSSL_SRP: `SSL_CTX_set_srp_username` present in OpenSSL # HAVE_GNUTLS_SRP: `gnutls_srp_verifier` present in GnuTLS # HAVE_SSL_SET_QUIC_USE_LEGACY_CODEPOINT: `SSL_set_quic_use_legacy_codepoint` present in OpenSSL/wolfSSL # HAVE_QUICHE_CONN_SET_QLOG_FD: `quiche_conn_set_qlog_fd` present in quiche @@ -999,7 +999,7 @@ if(USE_WOLFSSL) curl_openssl_check_symbol_exists("wolfSSL_BIO_set_shutdown" "wolfssl/options.h;wolfssl/ssl.h" HAVE_WOLFSSL_FULL_BIO) endif() -if(USE_OPENSSL OR USE_WOLFSSL) +if(USE_OPENSSL) if(NOT DEFINED HAVE_SSL_SET0_WBIO) curl_openssl_check_symbol_exists("SSL_set0_wbio" "openssl/ssl.h" HAVE_SSL_SET0_WBIO) endif()