diff options
author | Andrzej Kurek <andrzej.kurek@arm.com> | 2022-10-17 07:52:51 -0400 |
---|---|---|
committer | Andrzej Kurek <andrzej.kurek@arm.com> | 2022-10-19 08:35:09 -0400 |
commit | eabeb30c65d5f31856af46100ffe4c9fc2bd843b (patch) | |
tree | cf874188fd62fe535eff7e65bbc13683dbf52d17 /programs/fuzz | |
parent | 228b12ce54cbe9994fb255bb176869510aec4db3 (diff) | |
download | mbedtls-eabeb30c65d5f31856af46100ffe4c9fc2bd843b.zip mbedtls-eabeb30c65d5f31856af46100ffe4c9fc2bd843b.tar.gz mbedtls-eabeb30c65d5f31856af46100ffe4c9fc2bd843b.tar.bz2 |
Fix SHA512 vs SHA384 dependencies
When building SHA512 without SHA384,
there are some code paths that resulted
in unused variables or usage of undefined code.
This commit fixes that.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
Diffstat (limited to 'programs/fuzz')
-rw-r--r-- | programs/fuzz/fuzz_dtlsserver.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/programs/fuzz/fuzz_dtlsserver.c b/programs/fuzz/fuzz_dtlsserver.c index 1aa757c..17caab2 100644 --- a/programs/fuzz/fuzz_dtlsserver.c +++ b/programs/fuzz/fuzz_dtlsserver.c @@ -11,12 +11,14 @@ #include "mbedtls/ctr_drbg.h" #include "mbedtls/timing.h" #include "mbedtls/ssl_cookie.h" - +#include "mbedtls/legacy_or_psa.h" #if defined(MBEDTLS_SSL_SRV_C) && \ defined(MBEDTLS_ENTROPY_C) && \ defined(MBEDTLS_CTR_DRBG_C) && \ - defined(MBEDTLS_TIMING_C) + defined(MBEDTLS_TIMING_C) && \ + ( defined(MBEDTLS_HAS_ALG_SHA_384_VIA_MD_OR_PSA_BASED_ON_USE_PSA) || \ + defined(MBEDTLS_HAS_ALG_SHA_256_VIA_MD_OR_PSA_BASED_ON_USE_PSA) ) const char *pers = "fuzz_dtlsserver"; const unsigned char client_ip[4] = {0x7F, 0, 0, 1}; static int initialized = 0; @@ -32,7 +34,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { defined(MBEDTLS_SSL_SRV_C) && \ defined(MBEDTLS_ENTROPY_C) && \ defined(MBEDTLS_CTR_DRBG_C) && \ - defined(MBEDTLS_TIMING_C) + defined(MBEDTLS_TIMING_C) && \ + ( defined(MBEDTLS_HAS_ALG_SHA_384_VIA_MD_OR_PSA_BASED_ON_USE_PSA) || \ + defined(MBEDTLS_HAS_ALG_SHA_256_VIA_MD_OR_PSA_BASED_ON_USE_PSA) ) int ret; size_t len; mbedtls_ssl_context ssl; |