diff options
| author | Elms <jeff@wolfssl.com> | 2022-05-16 21:55:24 -0700 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2022-05-17 16:58:03 +0200 |
| commit | 835a205370e30c0b516c9a6cb5714bd64762b350 (patch) | |
| tree | afd5614e74615ea17565c54f98eb4be2fa61dfe6 /lib/curl_ntlm_core.c | |
| parent | 84052154f7988af1290fffb90ccf2ecb4f230943 (diff) | |
| download | curl-835a205370e30c0b516c9a6cb5714bd64762b350.tar.gz | |
wolfSSL: explicitly use compatibility layer
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
Diffstat (limited to 'lib/curl_ntlm_core.c')
| -rw-r--r-- | lib/curl_ntlm_core.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index f3b8b130f..4a3ed334d 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -59,13 +59,18 @@ #if defined(USE_OPENSSL_DES) || defined(USE_WOLFSSL) #ifdef USE_WOLFSSL -#include <wolfssl/options.h> -#endif - +# include <wolfssl/options.h> +# 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/md5.h> # include <openssl/ssl.h> # include <openssl/rand.h> +#endif + # if (defined(OPENSSL_VERSION_NUMBER) && \ (OPENSSL_VERSION_NUMBER < 0x00907001L)) && !defined(USE_WOLFSSL) # define DES_key_schedule des_key_schedule |