From e2e19959d76fe6a8fe594ca4fc8bdc2f2826d4a3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Aug 2019 03:33:04 -0400 Subject: [PATCH 1/2] Rename AEAD macro to not use double underscores This pattern (identifiers containing a double underscore anywhere in them) is reserved. --- include/psa/crypto_values.h | 16 ++++++++-------- tests/scripts/test_psa_constant_names.py | 1 + 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/include/psa/crypto_values.h b/include/psa/crypto_values.h index 2c0acf3260..e0600a189b 100644 --- a/include/psa/crypto_values.h +++ b/include/psa/crypto_values.h @@ -1015,15 +1015,15 @@ * \return The corresponding AEAD algorithm with the default * tag length for that algorithm. */ -#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH(aead_alg) \ - ( \ - PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_CCM) \ - PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_GCM) \ - PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, PSA_ALG_CHACHA20_POLY1305) \ +#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH(aead_alg) \ + ( \ + PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_CCM) \ + PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_GCM) \ + PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, PSA_ALG_CHACHA20_POLY1305) \ 0) -#define PSA__ALG_AEAD_WITH_DEFAULT_TAG_LENGTH__CASE(aead_alg, ref) \ - PSA_ALG_AEAD_WITH_TAG_LENGTH(aead_alg, 0) == \ - PSA_ALG_AEAD_WITH_TAG_LENGTH(ref, 0) ? \ +#define PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE(aead_alg, ref) \ + PSA_ALG_AEAD_WITH_TAG_LENGTH(aead_alg, 0) == \ + PSA_ALG_AEAD_WITH_TAG_LENGTH(ref, 0) ? \ ref : #define PSA_ALG_RSA_PKCS1V15_SIGN_BASE ((psa_algorithm_t)0x10020000) diff --git a/tests/scripts/test_psa_constant_names.py b/tests/scripts/test_psa_constant_names.py index d248ade187..cf3a2243af 100755 --- a/tests/scripts/test_psa_constant_names.py +++ b/tests/scripts/test_psa_constant_names.py @@ -162,6 +162,7 @@ class Inputs: # PSA_ALG_ECDH and PSA_ALG_FFDH are excluded for now as the script # currently doesn't support them. Deprecated errors are also excluded. _excluded_names = set(['PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH', + 'PSA_ALG_AEAD_WITH_DEFAULT_TAG_LENGTH_CASE', 'PSA_ALG_FULL_LENGTH_MAC', 'PSA_ALG_ECDH', 'PSA_ALG_FFDH', From 712f7a804e391737b0e9d2593abe291f4ccb0303 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 21 Aug 2019 03:34:00 -0400 Subject: [PATCH 2/2] Add a check for double underscores in identifiers in check-names.sh --- tests/scripts/check-names.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/scripts/check-names.sh b/tests/scripts/check-names.sh index 7d2302cb2b..68e8c74bf2 100755 --- a/tests/scripts/check-names.sh +++ b/tests/scripts/check-names.sh @@ -57,11 +57,14 @@ for THING in actual-macros enum-consts; do printf "Names of $THING: " test -r $THING BAD=$( grep -E -v '^(MBEDTLS|PSA)_[0-9A-Z_]*[0-9A-Z]$' $THING || true ) - if [ "x$BAD" = "x" ]; then + UNDERSCORES=$( grep -E '.*__.*' $THING || true ) + + if [ "x$BAD" = "x" ] && [ "x$UNDERSCORES" = "x" ]; then echo "PASS" else echo "FAIL" echo "$BAD" + echo "$UNDERSCORES" FAIL=1 fi done