From 9d28c426d14d57315dbb63212c0f5ec3f7785db3 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Wed, 26 Feb 2020 19:00:46 +0100 Subject: [PATCH] Revert "check-names: Enable referencing Mbed TLS macros" This reverts commit 7fcc7bc57699ce57fef8e590a0fb502ea6f65c0e. --- tests/scripts/list-macros.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/tests/scripts/list-macros.sh b/tests/scripts/list-macros.sh index 9a89737df3..3540b8e523 100755 --- a/tests/scripts/list-macros.sh +++ b/tests/scripts/list-macros.sh @@ -10,15 +10,8 @@ fi HEADERS=$( ls include/mbedtls/*.h include/psa/*.h | egrep -v 'compat-1\.3\.h' ) HEADERS="$HEADERS 3rdparty/everest/include/everest/everest.h 3rdparty/everest/include/everest/x25519.h" -# White-list macros we want to be able to refer to that don't exist in the -# crypto library, useful when referring to macros in Mbed TLS from comments. -WHITELIST='MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS' - -# Generate a list of macros and combine it with the white-listed macros in -# sorted order. -{ sed -n -e 's/.*#define \([a-zA-Z0-9_]*\).*/\1/p' $HEADERS | - egrep -v '^(asm|inline|EMIT|_CRT_SECURE_NO_DEPRECATE)$|^MULADDC_'; - printf '%s\n' $WHITELIST; -} | sort -u > macros +sed -n -e 's/.*#define \([a-zA-Z0-9_]*\).*/\1/p' $HEADERS \ + | egrep -v '^(asm|inline|EMIT|_CRT_SECURE_NO_DEPRECATE)$|^MULADDC_' \ + | sort -u > macros wc -l macros