config-wrapper-zeroize-memset.h should be user-config-zeroize-memset.h and not include mbedtls_config.h

Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
This commit is contained in:
Tom Cosgrove 2023-09-01 14:40:21 +01:00
parent d9572c0270
commit b2fafa5a49
2 changed files with 2 additions and 4 deletions

View file

@ -1,4 +1,4 @@
/* mbedtls_config.h wrapper that defines mbedtls_platform_zeroize() to be /* mbedtls_config.h modifier that defines mbedtls_platform_zeroize() to be
* memset(), so that the compile can check arguments for us. * memset(), so that the compile can check arguments for us.
* Used for testing. * Used for testing.
*/ */
@ -19,8 +19,6 @@
* limitations under the License. * limitations under the License.
*/ */
#include "mbedtls/mbedtls_config.h"
#include <string.h> #include <string.h>
/* Define _ALT so we don't get the built-in implementation. The test code will /* Define _ALT so we don't get the built-in implementation. The test code will

View file

@ -5123,7 +5123,7 @@ component_build_zeroize_checks () {
scripts/config.py full scripts/config.py full
# Only compile - we're looking for sizeof-pointer-memaccess warnings # Only compile - we're looking for sizeof-pointer-memaccess warnings
make CC=gcc CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/config-wrapper-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess" make CC=gcc CFLAGS="'-DMBEDTLS_USER_CONFIG_FILE=\"../tests/configs/user-config-zeroize-memset.h\"' -DMBEDTLS_TEST_DEFINES_ZEROIZE -Werror -Wsizeof-pointer-memaccess"
} }