commit 7b453130e26d1579b93c254a986216c90c216c52
author John Durkop <john.durkop@fermatsoftware.com> Mon Oct 12 21:56:26 2020 -0700
committer John Durkop <john.durkop@fermatsoftware.com> Mon Oct 12 21:56:26 2020 -0700
tree ee6b98ee727b7ed5ed284665a72b763edbc8bc00
parent dd544e1463fd1f5daab3e02629eb739d88ccd469

Updates  to fix check-names and all.sh tests after review

Need to make sure the new MBEDTLS_PSA_ACCEL_XXX defines are not checked
since they should be defined by the PSA driver. Updated the list-macros.sh
script to modify the instances of those found to match the corresponding
MBEDTLS_PSA_BUILTIN_XXX that are defined in config_psa.h

Fixed definition of MBEDTLS_PSA_BUILTIN_ALG_ECDSA_DETERMINISTIC, name was
incorrect. Also fixed a missing space in the comments of crypto_config.h

Signed-off-by: John Durkop <john.durkop@fermatsoftware.com>

include/mbedtls/config_psa.h

diff --git a/include/mbedtls/config_psa.h b/include/mbedtls/config_psa.h
index 02bdfb1..87c092a 100644
--- a/include/mbedtls/config_psa.h
+++ b/include/mbedtls/config_psa.h
@@ -49,7 +49,7 @@
 
 #if defined(PSA_WANT_ALG_ECDSA_DETERMINISTIC)
 #if !defined(MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC)
-#define MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA     1
+#define MBEDTLS_PSA_BUILTIN_ALG_ECDSA_DETERMINISTIC     1
 #define MBEDTLS_ECDSA_DETERMINISTIC
 #endif /* MBEDTLS_PSA_ACCEL_ALG_ECDSA_DETERMINISTIC */
 #endif /* PSA_WANT_ALG_DETERMINISTIC_ECDSA */

include/psa/crypto_config.h

diff --git a/include/psa/crypto_config.h b/include/psa/crypto_config.h
index 808c68a..28702eb 100644
--- a/include/psa/crypto_config.h
+++ b/include/psa/crypto_config.h
@@ -2,7 +2,7 @@
  * \file psa/crypto_config.h
  * \brief PSA crypto configuration options (set of defines)
  *
-*/
+ */
 #if defined(MBEDTLS_PSA_CRYPTO_CONFIG)
 /**
  * When #MBEDTLS_PSA_CRYPTO_CONFIG is enabled in config.h,

tests/scripts/list-macros.sh

diff --git a/tests/scripts/list-macros.sh b/tests/scripts/list-macros.sh
index 15d2590..a8617a0 100755
--- a/tests/scripts/list-macros.sh
+++ b/tests/scripts/list-macros.sh
@@ -30,4 +30,10 @@
     | egrep -v '^(asm|inline|EMIT|_CRT_SECURE_NO_DEPRECATE)$|^MULADDC_' \
     | sort -u > macros
 
+# For include/mbedtls/config_psa.h need to ignore the MBEDTLS_xxx define
+# in that file since they may not be defined in include/psa/crypto_config.h
+# This line renames the potentially missing defines to ones that should
+# be present.
+sed -ne 's/^MBEDTLS_PSA_BUILTIN_/MBEDTLS_PSA_ACCEL_/p' <macros >>macros
+
 wc -l macros