romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 21:03:34 +03:00
Code Issues Projects Releases Packages Wiki Activity

build: tidy up internal feature detection variables for wolfSSL

Browse source 
Sync them with the function name they detect, and sync them between
cmake and autotools.

- rename `HAVE_WOLFSSL_BIO` to `HAVE_WOLFSSL_BIO_NEW`.
- rename `HAVE_WOLFSSL_FULL_BIO` to `HAVE_WOLFSSL_BIO_SET_SHUTDOWN`.
- autotools: rename `WOLFSSL_NTLM` to `HAVE_WOLFSSL_DES_ECB_ENCRYPT`
  (to sync with cmake).
- autotools: rename `WOLFSSL_BIO` to `HAVE_WOLFSSL_BIO_NEW`
  (to sync with cmake).
- autotools: simplify `HAVE_WOLFSSL_DES_ECB_ENCRYPT` detection.

Cherry-picked from #17082

Closes #17175
This commit is contained in:
Viktor Szakats 2025-04-17 23:47:37 +02:00
parent 1f6fef7ec0
commit ae0ff69f7a
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
6 changed files with 24 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

34
m4/curl-wolfssl.m4
View file

@ -135,35 +135,23 @@ if test "x$OPT_WOLFSSL" != xno; then
dnl wolfSSL needs configure --enable-opensslextra to have *get_peer*
dnl DES* is needed for NTLM support and lives in the OpenSSL compatibility
dnl layer
dnl if wolfSSL_BIO_set_shutdown is present, we have the full BIO feature set
AC_CHECK_FUNCS(wolfSSL_get_peer_certificate \
wolfSSL_UseALPN )
wolfSSL_UseALPN \
wolfSSL_DES_ecb_encrypt \
wolfSSL_BIO_new \
wolfSSL_BIO_set_shutdown)
dnl if this symbol is present, we want the include path to include the
dnl OpenSSL API root as well
AC_CHECK_FUNC(wolfSSL_DES_ecb_encrypt,
[
AC_DEFINE(HAVE_WOLFSSL_DES_ECB_ENCRYPT, 1,
[if you have wolfSSL_DES_ecb_encrypt])
WOLFSSL_NTLM=1
]
)
if test "x$ac_cv_func_wolfSSL_DES_ecb_encrypt" = 'xyes'; then
HAVE_WOLFSSL_DES_ECB_ENCRYPT=1
fi
dnl if this symbol is present, we can make use of BIO filter chains
AC_CHECK_FUNC(wolfSSL_BIO_new,
[
AC_DEFINE(HAVE_WOLFSSL_BIO, 1,
[if you have wolfSSL_BIO_new])
WOLFSSL_BIO=1
]
)
dnl if this symbol is present, we have the full BIO feature set
AC_CHECK_FUNC(wolfSSL_BIO_set_shutdown,
[
AC_DEFINE(HAVE_WOLFSSL_FULL_BIO, 1,
[if you have wolfSSL_BIO_set_shutdown])
WOLFSSL_FULL_BIO=1
]
)
if test "x$ac_cv_func_wolfSSL_BIO_new" = 'xyes'; then
HAVE_WOLFSSL_BIO_NEW=1
fi
if test -n "$wolfssllibpath"; then
dnl when shared libs were found in a path that the run-time