From 90581ee629dd1926154cc62f38091e2d8b80daca Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Sun, 12 Apr 2020 14:02:47 +0200 Subject: [PATCH] Turn off DEPRECATED_WARNING in full and baremetal MBEDTLS_DEPRECATED_REMOVED is turned off in full since we don't want to turn off deprecated features. Also turn off MBEDTLS_DEPRECATED_WARNING since we wouldn't want expected warnings: we're aware that we're enabling deprecated modules. Since MBEDTLS_DEPRECATED_WARNING is excluded from full, it doesn't need to be excluded from baremetal explicitly. Signed-off-by: Gilles Peskine --- scripts/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/config.py b/scripts/config.py index 79e8e4e09..acc92100a 100755 --- a/scripts/config.py +++ b/scripts/config.py @@ -170,6 +170,7 @@ EXCLUDE_FROM_FULL = frozenset([ #pylint: disable=line-too-long 'MBEDTLS_CTR_DRBG_USE_128_BIT_KEY', # variant toggle 'MBEDTLS_DEPRECATED_REMOVED', # conflicts with deprecated options + 'MBEDTLS_DEPRECATED_WARNING', # conflicts with deprecated options 'MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED', # variant toggle 'MBEDTLS_ECP_RESTARTABLE', # incompatible with USE_PSA_CRYPTO 'MBEDTLS_ENTROPY_FORCE_SHA256', # variant toggle @@ -234,7 +235,6 @@ def full_adapter(name, active, section): # need to be repeated here. EXCLUDE_FROM_BAREMETAL = frozenset([ #pylint: disable=line-too-long - 'MBEDTLS_DEPRECATED_WARNING', 'MBEDTLS_ENTROPY_NV_SEED', # requires FS_IO or alternate NV seed hooks 'MBEDTLS_FS_IO', # requires a filesystem 'MBEDTLS_HAVEGE_C', # requires a clock