curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 17:42:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

wolfSSL: explicitly use compatibility layer

Browse Source 
This change removes adding an include `$prefix/wolfssl` or similar to
allow for openssl include aliasing. Include paths of `wolfssl/openssl/`
are used to explicitly use wolfSSL includes. This fixes cmake builds as
well as avoiding potentially using openSSL headers since include path
order is not guaranteed.

Closes #8864
This commit is contained in:
Elms 2022-05-16 21:55:24 -07:00 committed by Daniel Stenberg
parent 84052154f7
commit 835a205370
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
4 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/curl_ntlm_core.c
View File

@ -59,13 +59,18 @@
#if defined(USE_OPENSSL_DES) || defined(USE_WOLFSSL) #if defined(USE_OPENSSL_DES) || defined(USE_WOLFSSL)
#ifdef USE_WOLFSSL #ifdef USE_WOLFSSL
#include <wolfssl/options.h> # include <wolfssl/options.h>
#endif # include <wolfssl/openssl/des.h>
# include <wolfssl/openssl/md5.h>
# include <wolfssl/openssl/ssl.h>
# include <wolfssl/openssl/rand.h>
#else
# include <openssl/des.h> # include <openssl/des.h>
# include <openssl/md5.h> # include <openssl/md5.h>
# include <openssl/ssl.h> # include <openssl/ssl.h>
# include <openssl/rand.h> # include <openssl/rand.h>
#endif
# if (defined(OPENSSL_VERSION_NUMBER) && \ # if (defined(OPENSSL_VERSION_NUMBER) && \
(OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL)
# define DES_key_schedule des_key_schedule # define DES_key_schedule des_key_schedule

4
lib/curl_ntlm_core.h
View File

@ -35,10 +35,10 @@
#define NTLM_NEEDS_NSS_INIT #define NTLM_NEEDS_NSS_INIT
#endif #endif
#if defined(USE_OPENSSL) || defined(USE_WOLFSSL)
#ifdef USE_WOLFSSL #ifdef USE_WOLFSSL
# include <wolfssl/options.h> # include <wolfssl/options.h>
#endif # include <wolfssl/openssl/ssl.h>
#elif defined(USE_OPENSSL)
# include <openssl/ssl.h> # include <openssl/ssl.h>
#endif #endif

8
lib/md4.c
View File

@ -39,7 +39,7 @@
#ifdef USE_WOLFSSL #ifdef USE_WOLFSSL
#include <wolfssl/options.h> #include <wolfssl/options.h>
#ifdef NO_MD4 #ifdef NO_MD4
#define OPENSSL_NO_MD4 #define WOLFSSL_NO_MD4
#endif #endif
#endif #endif
@ -82,9 +82,11 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx)
md4_digest(ctx, MD4_DIGEST_SIZE, result); md4_digest(ctx, MD4_DIGEST_SIZE, result);
} }
#elif (defined(USE_OPENSSL) || defined(USE_WOLFSSL)) && \
!defined(OPENSSL_NO_MD4)
/* When OpenSSL or wolfSSL is available, we use their MD4 functions. */ /* When OpenSSL or wolfSSL is available, we use their MD4 functions. */
#elif defined(USE_WOLFSSL) && !defined(WOLFSSL_NO_MD4)
#include <wolfssl/openssl/md4.h>
#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4)
#include <openssl/md4.h> #include <openssl/md4.h>
#elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \

13
m4/curl-wolfssl.m4
View File

@ -136,19 +136,6 @@ if test "x$OPT_WOLFSSL" != xno; then
[ [
AC_DEFINE(HAVE_WOLFSSL_DES_ECB_ENCRYPT, 1, AC_DEFINE(HAVE_WOLFSSL_DES_ECB_ENCRYPT, 1,
[if you have wolfSSL_DES_ecb_encrypt]) [if you have wolfSSL_DES_ecb_encrypt])
if test -n "$addcflags"; then
dnl use a for loop to strip off whitespace
for f in $addcflags; do
CPPFLAGS="$f/wolfssl $CPPFLAGS"
AC_MSG_NOTICE([Add $f/wolfssl to CPPFLAGS])
break
done
else
dnl user didn't give a path, so guess/hope they installed wolfssl
dnl headers to system default location
CPPFLAGS="-I/usr/include/wolfssl $CPPFLAGS"
AC_MSG_NOTICE([Add /usr/include/wolfssl to CPPFLAGS])
fi
WOLFSSL_NTLM=1 WOLFSSL_NTLM=1
] ]
) )