commit 93b15619f4c3752cf7cff2ac667f41ef320582a4
author Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 23 18:02:00 2020 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> Thu Apr 23 20:05:00 2020 +0200
tree d0bbd21f5b48489c0880f19c280c774040ea5d0c
parent 4099df6fb2ffd0390003857a1f0c5746da41505c

MBEDTLS_DEPRECATED_WARNING now always emits a #warning

MBEDTLS_DEPRECATED_WARNING now always emits a #warning since this
branch as a whole is deprecated. So disable it from most builds.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>

scripts/config.py

diff --git a/scripts/config.py b/scripts/config.py
index 6d4828a..d6d6c8b 100755
--- a/scripts/config.py
+++ b/scripts/config.py
@@ -166,6 +166,7 @@
     if name in [
             'MBEDTLS_CTR_DRBG_USE_128_BIT_KEY',
             'MBEDTLS_DEPRECATED_REMOVED',
+            'MBEDTLS_DEPRECATED_WARNING',
             'MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED',
             'MBEDTLS_ECP_RESTARTABLE',
             'MBEDTLS_ENTROPY_FORCE_SHA256', # Variant toggle, tested separately

tests/scripts/all.sh

diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index fd31773..603845b 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -702,16 +702,17 @@
 }
 
 component_build_deprecated () {
-    msg "build: make, full config + DEPRECATED_WARNING, gcc -O" # ~ 30s
+    msg "build: make, full config + DEPRECATED_WARNING, gcc -O, expect warnings" # ~ 30s
     scripts/config.py full
     scripts/config.py set MBEDTLS_DEPRECATED_WARNING
     # Build with -O -Wextra to catch a maximum of issues.
-    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra' lib programs
-    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests
+    # Expect #warning stating that Mbed Crypto is no longer updated.
+    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=cpp' lib programs
+    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=cpp -Wno-unused-function' tests
 
     msg "test: make, full config + DEPRECATED_WARNING, expect warnings" # ~ 30s
     make -C tests clean
-    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=deprecated-declarations -DMBEDTLS_TEST_DEPRECATED' tests
+    make CC=gcc CFLAGS='-O -Werror -Wall -Wextra -Wno-error=cpp -Wno-error=deprecated-declarations -DMBEDTLS_TEST_DEPRECATED' tests
 }
 
 component_test_depends_curves () {