From b64e0fe5e35b174b8070827d92ec0a6aed6910f6 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 9 Nov 2020 15:14:10 +0100 Subject: [PATCH] Fix conditions for including string.h in error.c is actually needed when MBEDTLS_ERROR_C is enabled and not when only MBEDTLS_ERROR_STRERROR_DUMMY is enabled. Fix #3866. Signed-off-by: Gilles Peskine --- ChangeLog.d/error-include-string.txt | 2 ++ library/error.c | 2 +- scripts/data_files/error.fmt | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 ChangeLog.d/error-include-string.txt diff --git a/ChangeLog.d/error-include-string.txt b/ChangeLog.d/error-include-string.txt new file mode 100644 index 000000000..0a12c7bec --- /dev/null +++ b/ChangeLog.d/error-include-string.txt @@ -0,0 +1,2 @@ +Bugfix + * Fix conditions for including string.h in error.c. Fixes #3866. diff --git a/library/error.c b/library/error.c index cba61e9e7..0d9f736b9 100644 --- a/library/error.c +++ b/library/error.c @@ -19,7 +19,7 @@ #include "common.h" -#if defined(MBEDTLS_ERROR_STRERROR_DUMMY) +#if defined(MBEDTLS_ERROR_C) #include #endif diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt index fd72f8b5f..1c8a79036 100644 --- a/scripts/data_files/error.fmt +++ b/scripts/data_files/error.fmt @@ -19,7 +19,7 @@ #include "common.h" -#if defined(MBEDTLS_ERROR_STRERROR_DUMMY) +#if defined(MBEDTLS_ERROR_C) #include #endif