diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-29 16:40:11 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-10-29 16:41:27 -0400 |
| commit | 6fb63fa8d61bdacdc0041f954db860a66c1120a6 (patch) | |
| tree | 8a90db0dd61c74e7c66c30cdbf9326107e11e92a | |
| parent | 441c95c6970c11e34add529cbff3a8bf833d5c74 (diff) | |
| download | lighttpd-git-6fb63fa8d61bdacdc0041f954db860a66c1120a6.tar.gz | |
[multiple] include mbedtls/config.h after select
include mbedtls/config.h crypto lib config
after selecting crypto lib to use
| -rw-r--r-- | src/mod_mbedtls.c | 1 | ||||
| -rw-r--r-- | src/rand.c | 2 | ||||
| -rw-r--r-- | src/sys-crypto-md.h | 2 | ||||
| -rw-r--r-- | src/sys-crypto.h | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/mod_mbedtls.c b/src/mod_mbedtls.c index 43412d22..c322a25a 100644 --- a/src/mod_mbedtls.c +++ b/src/mod_mbedtls.c @@ -56,6 +56,7 @@ #include <stdio.h> /* vsnprintf() */ #include <string.h> +#include <mbedtls/config.h> #include <mbedtls/ctr_drbg.h> #include <mbedtls/dhm.h> #include <mbedtls/error.h> @@ -20,7 +20,7 @@ #include <time.h> #include <unistd.h> -#include "sys-crypto.h" /* USE_LIB_CRYPTO */ +#include "sys-crypto-md.h" /* USE_LIB_CRYPTO and additional crypto lib config */ #ifdef USE_NETTLE_CRYPTO #undef USE_MBEDTLS_CRYPTO #undef USE_WOLFSSL_CRYPTO diff --git a/src/sys-crypto-md.h b/src/sys-crypto-md.h index 555b47cd..34960cc3 100644 --- a/src/sys-crypto-md.h +++ b/src/sys-crypto-md.h @@ -129,6 +129,8 @@ SHA512_256_Update(SHA512_CTX *ctx, const void *data, size_t length) #elif defined(USE_MBEDTLS_CRYPTO) +#include <mbedtls/config.h> + #ifdef MBEDTLS_MD4_C #define USE_LIB_CRYPTO_MD4 #include <mbedtls/md4.h> diff --git a/src/sys-crypto.h b/src/sys-crypto.h index 81bc08fd..8fda44d0 100644 --- a/src/sys-crypto.h +++ b/src/sys-crypto.h @@ -40,7 +40,6 @@ #ifdef HAVE_LIBMBEDCRYPTO #define USE_LIB_CRYPTO #define USE_MBEDTLS_CRYPTO -#include <mbedtls/config.h> #endif #ifdef HAVE_NSS3_NSS_H |