Merge pull request #5167 from tom-cosgrove-arm/fix-builds-with-only-mbedtls_bignum_c-defined

Backport 2.x: Fix builds when config.h only defines MBEDTLS_BIGNUM_C
This commit is contained in:
Gilles Peskine 2021-12-07 12:38:04 +01:00 committed by GitHub
commit 582f2398d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 1 deletions

View File

@ -0,0 +1,3 @@
Bugfix
* Fix the build when no SHA2 module is included. Fixes #4930.
* Fix the build when only the bignum module is included. Fixes #4929.

View File

@ -130,7 +130,7 @@ typedef struct mbedtls_entropy_context
* -1 after free. */ * -1 after free. */
#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
mbedtls_sha512_context accumulator; mbedtls_sha512_context accumulator;
#else #elif defined(MBEDTLS_ENTROPY_SHA256_ACCUMULATOR)
mbedtls_sha256_context accumulator; mbedtls_sha256_context accumulator;
#endif #endif
int source_count; /* Number of entries used in source. */ int source_count; /* Number of entries used in source. */

View File

@ -43,6 +43,7 @@
#include "mbedtls/error.h" #include "mbedtls/error.h"
#include "constant_time_internal.h" #include "constant_time_internal.h"
#include <limits.h>
#include <string.h> #include <string.h>
#if defined(MBEDTLS_PLATFORM_C) #if defined(MBEDTLS_PLATFORM_C)

View File

@ -1,4 +1,5 @@
#include "common.h" #include "common.h"
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>