diff options
| author | Harry Sarson <harry.sarson@hotmail.co.uk> | 2022-01-21 13:32:16 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2022-01-21 23:04:02 +0100 |
| commit | 392fdb04388de6977da7df6168f2ec7c419dccb9 (patch) | |
| tree | ec5b8f618f01ec54e82a6252b7befbfcb64d186e | |
| parent | 8a3e67e732cff0b988f1d6f2d02a2c9cd2e87b1f (diff) | |
| download | curl-392fdb04388de6977da7df6168f2ec7c419dccb9.tar.gz | |
misc: allow curl to build with wolfssl --enable-opensslextra
put all #include of openssl files behind wolfssl ifdefs so that we can
use the wolfssl/ prefixed include paths. Without these curl only builds
when wolfssl is built with enable-all.
Fixes #8292
Closes #8315
| -rw-r--r-- | lib/curl_sha256.h | 4 | ||||
| -rw-r--r-- | lib/md5.c | 7 | ||||
| -rw-r--r-- | lib/sha256.c | 10 |
3 files changed, 16 insertions, 5 deletions
diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h index 55dc30ad7..2b7890a03 100644 --- a/lib/curl_sha256.h +++ b/lib/curl_sha256.h @@ -8,7 +8,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2017, Florin Petriuc, <petriuc.florin@gmail.com> - * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -32,7 +32,7 @@ extern const struct HMAC_params Curl_HMAC_SHA256[1]; /* SHA256_DIGEST_LENGTH is an enum value in wolfSSL. Need to import it from * sha.h*/ #include <wolfssl/options.h> -#include <openssl/sha.h> +#include <wolfssl/openssl/sha.h> #else #define SHA256_DIGEST_LENGTH 32 #endif @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -83,7 +83,12 @@ static void MD5_Final(unsigned char *digest, MD5_CTX *ctx) #elif defined(USE_OPENSSL_MD5) || defined(USE_WOLFSSL_MD5) /* When OpenSSL or wolfSSL is available, we use their MD5 functions. */ +#if defined(USE_OPENSSL_MD5) #include <openssl/md5.h> +#elif defined(USE_WOLFSSL_MD5) +#include <wolfssl/openssl/md5.h> +#endif + #include "curl_memory.h" /* The last #include file should be: */ #include "memdebug.h" diff --git a/lib/sha256.c b/lib/sha256.c index cf7ea4f54..30c7e1d07 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -6,7 +6,7 @@ * \___|\___/|_| \_\_____| * * Copyright (C) 2017, Florin Petriuc, <petriuc.florin@gmail.com> - * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -69,8 +69,14 @@ #if defined(USE_OPENSSL_SHA256) -/* When OpenSSL is available we use the SHA256-function from OpenSSL */ +/* When OpenSSL or wolfSSL is available is available we use their + * SHA256-functions. + */ +#if defined(USE_OPENSSL) #include <openssl/evp.h> +#elif defined(USE_WOLFSSL) +#include <wolfssl/openssl/evp.h> +#endif #include "curl_memory.h" |