From 69c489c25abbee299d5c96fe4a41ce564f5a5a57 Mon Sep 17 00:00:00 2001 From: Ronald Cron Date: Wed, 31 Jul 2024 08:36:59 +0200 Subject: [PATCH] Move PSA drivers to drivers/builtin/src They were mistakenly moved to the core directory from the library directory. Signed-off-by: Ronald Cron --- library/Makefile | 18 +++++++++--------- tests/src/drivers/hash.c | 2 +- tests/src/drivers/test_driver_aead.c | 2 +- .../test_driver_asymmetric_encryption.c | 2 +- tests/src/drivers/test_driver_cipher.c | 2 +- tests/src/drivers/test_driver_key_agreement.c | 4 ++-- tests/src/drivers/test_driver_key_management.c | 6 +++--- tests/src/drivers/test_driver_mac.c | 2 +- tests/src/drivers/test_driver_pake.c | 2 +- tests/src/drivers/test_driver_signature.c | 6 +++--- tf-psa-crypto/core/CMakeLists.txt | 9 --------- .../builtin/src}/psa_crypto_aead.c | 0 .../builtin/src}/psa_crypto_aead.h | 0 .../builtin/src}/psa_crypto_cipher.c | 0 .../builtin/src}/psa_crypto_cipher.h | 0 .../builtin/src}/psa_crypto_ecp.c | 0 .../builtin/src}/psa_crypto_ecp.h | 0 .../builtin/src}/psa_crypto_ffdh.c | 0 .../builtin/src}/psa_crypto_ffdh.h | 0 .../builtin/src}/psa_crypto_hash.c | 0 .../builtin/src}/psa_crypto_hash.h | 0 .../builtin/src}/psa_crypto_mac.c | 0 .../builtin/src}/psa_crypto_mac.h | 0 .../builtin/src}/psa_crypto_pake.c | 0 .../builtin/src}/psa_crypto_pake.h | 0 .../builtin/src}/psa_crypto_rsa.c | 0 .../builtin/src}/psa_crypto_rsa.h | 0 .../{core => drivers/builtin/src}/psa_util.c | 0 .../builtin/src}/psa_util_internal.h | 0 29 files changed, 23 insertions(+), 32 deletions(-) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_aead.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_aead.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_cipher.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_cipher.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_ecp.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_ecp.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_ffdh.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_ffdh.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_hash.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_hash.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_mac.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_mac.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_pake.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_pake.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_rsa.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_crypto_rsa.h (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_util.c (100%) rename tf-psa-crypto/{core => drivers/builtin/src}/psa_util_internal.h (100%) diff --git a/library/Makefile b/library/Makefile index e9651580f9..96f454eac4 100644 --- a/library/Makefile +++ b/library/Makefile @@ -111,21 +111,12 @@ endif OBJS_CRYPTO= \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_aead.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_cipher.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_client.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_driver_wrappers_no_static.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_ecp.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_ffdh.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_hash.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_mac.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_pake.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_rsa.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_se.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_slot_management.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_crypto_storage.o \ $(TF_PSA_CRYPTO_CORE_PATH)/psa_its_file.o \ - $(TF_PSA_CRYPTO_CORE_PATH)/psa_util.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/aes.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/aesni.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/aesce.o \ @@ -179,6 +170,15 @@ OBJS_CRYPTO= \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/platform.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/platform_util.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/poly1305.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_aead.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_cipher.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_ecp.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_ffdh.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_hash.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_mac.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_pake.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_crypto_rsa.o \ + $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/psa_util.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/ripemd160.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/rsa.o \ $(TF_PSA_CRYPTO_DRIVERS_BUILTIN_SRC_PATH)/rsa_alt_helpers.o \ diff --git a/tests/src/drivers/hash.c b/tests/src/drivers/hash.c index 2416ba8123..5d938ea579 100644 --- a/tests/src/drivers/hash.c +++ b/tests/src/drivers/hash.c @@ -13,7 +13,7 @@ #include "test/drivers/hash.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_hash.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.h" #endif mbedtls_test_driver_hash_hooks_t diff --git a/tests/src/drivers/test_driver_aead.c b/tests/src/drivers/test_driver_aead.c index 080b4dba81..9c0677a7eb 100644 --- a/tests/src/drivers/test_driver_aead.c +++ b/tests/src/drivers/test_driver_aead.c @@ -16,7 +16,7 @@ #include "mbedtls/constant_time.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_aead.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.h" #endif mbedtls_test_driver_aead_hooks_t diff --git a/tests/src/drivers/test_driver_asymmetric_encryption.c b/tests/src/drivers/test_driver_asymmetric_encryption.c index 55e09b2f34..32644009e0 100644 --- a/tests/src/drivers/test_driver_asymmetric_encryption.c +++ b/tests/src/drivers/test_driver_asymmetric_encryption.c @@ -16,7 +16,7 @@ #include "test/drivers/key_management.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_rsa.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.h" #endif #define PSA_RSA_KEY_PAIR_MAX_SIZE \ diff --git a/tests/src/drivers/test_driver_cipher.c b/tests/src/drivers/test_driver_cipher.c index ace0ed313d..136610b36b 100644 --- a/tests/src/drivers/test_driver_cipher.c +++ b/tests/src/drivers/test_driver_cipher.c @@ -19,7 +19,7 @@ #include "test/random.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_cipher.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.h" #endif #include diff --git a/tests/src/drivers/test_driver_key_agreement.c b/tests/src/drivers/test_driver_key_agreement.c index 8a8e3a8074..b99d7cdba0 100644 --- a/tests/src/drivers/test_driver_key_agreement.c +++ b/tests/src/drivers/test_driver_key_agreement.c @@ -21,8 +21,8 @@ #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) #include "libtestdriver1/tf-psa-crypto/include/psa/crypto.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_ecp.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_ffdh.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.h" #endif mbedtls_test_driver_key_agreement_hooks_t diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c index c0869f1291..337c254738 100644 --- a/tests/src/drivers/test_driver_key_management.c +++ b/tests/src/drivers/test_driver_key_management.c @@ -23,9 +23,9 @@ #include "test/random.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_ecp.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_rsa.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_ffdh.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.h" #endif #include diff --git a/tests/src/drivers/test_driver_mac.c b/tests/src/drivers/test_driver_mac.c index de43e49074..9b671b8676 100644 --- a/tests/src/drivers/test_driver_mac.c +++ b/tests/src/drivers/test_driver_mac.c @@ -13,7 +13,7 @@ #include "test/drivers/mac.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_mac.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.h" #endif mbedtls_test_driver_mac_hooks_t mbedtls_test_driver_mac_hooks = diff --git a/tests/src/drivers/test_driver_pake.c b/tests/src/drivers/test_driver_pake.c index 963110109a..bcef6b5f47 100644 --- a/tests/src/drivers/test_driver_pake.c +++ b/tests/src/drivers/test_driver_pake.c @@ -14,7 +14,7 @@ #include "string.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_pake.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.h" #endif mbedtls_test_driver_pake_hooks_t mbedtls_test_driver_pake_hooks = diff --git a/tests/src/drivers/test_driver_signature.c b/tests/src/drivers/test_driver_signature.c index 02c6298a29..92ec93becd 100644 --- a/tests/src/drivers/test_driver_signature.c +++ b/tests/src/drivers/test_driver_signature.c @@ -26,9 +26,9 @@ #include "test/random.h" #if defined(MBEDTLS_TEST_LIBTESTDRIVER1) -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_ecp.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_hash.h" -#include "libtestdriver1/tf-psa-crypto/core/psa_crypto_rsa.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.h" +#include "libtestdriver1/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.h" #endif #include diff --git a/tf-psa-crypto/core/CMakeLists.txt b/tf-psa-crypto/core/CMakeLists.txt index 1e4a8c73b0..c138ab3dc8 100644 --- a/tf-psa-crypto/core/CMakeLists.txt +++ b/tf-psa-crypto/core/CMakeLists.txt @@ -1,20 +1,11 @@ set(src_crypto psa_crypto.c - psa_crypto_aead.c - psa_crypto_cipher.c psa_crypto_client.c psa_crypto_driver_wrappers_no_static.c - psa_crypto_ecp.c - psa_crypto_ffdh.c - psa_crypto_hash.c - psa_crypto_mac.c - psa_crypto_pake.c - psa_crypto_rsa.c psa_crypto_se.c psa_crypto_slot_management.c psa_crypto_storage.c psa_its_file.c - psa_util.c ) if(GEN_FILES) diff --git a/tf-psa-crypto/core/psa_crypto_aead.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_aead.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.c diff --git a/tf-psa-crypto/core/psa_crypto_aead.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_aead.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_aead.h diff --git a/tf-psa-crypto/core/psa_crypto_cipher.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_cipher.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.c diff --git a/tf-psa-crypto/core/psa_crypto_cipher.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_cipher.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_cipher.h diff --git a/tf-psa-crypto/core/psa_crypto_ecp.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_ecp.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.c diff --git a/tf-psa-crypto/core/psa_crypto_ecp.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_ecp.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_ecp.h diff --git a/tf-psa-crypto/core/psa_crypto_ffdh.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_ffdh.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.c diff --git a/tf-psa-crypto/core/psa_crypto_ffdh.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_ffdh.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_ffdh.h diff --git a/tf-psa-crypto/core/psa_crypto_hash.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_hash.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.c diff --git a/tf-psa-crypto/core/psa_crypto_hash.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_hash.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_hash.h diff --git a/tf-psa-crypto/core/psa_crypto_mac.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_mac.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.c diff --git a/tf-psa-crypto/core/psa_crypto_mac.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_mac.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_mac.h diff --git a/tf-psa-crypto/core/psa_crypto_pake.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_pake.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.c diff --git a/tf-psa-crypto/core/psa_crypto_pake.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_pake.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_pake.h diff --git a/tf-psa-crypto/core/psa_crypto_rsa.c b/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c similarity index 100% rename from tf-psa-crypto/core/psa_crypto_rsa.c rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.c diff --git a/tf-psa-crypto/core/psa_crypto_rsa.h b/tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.h similarity index 100% rename from tf-psa-crypto/core/psa_crypto_rsa.h rename to tf-psa-crypto/drivers/builtin/src/psa_crypto_rsa.h diff --git a/tf-psa-crypto/core/psa_util.c b/tf-psa-crypto/drivers/builtin/src/psa_util.c similarity index 100% rename from tf-psa-crypto/core/psa_util.c rename to tf-psa-crypto/drivers/builtin/src/psa_util.c diff --git a/tf-psa-crypto/core/psa_util_internal.h b/tf-psa-crypto/drivers/builtin/src/psa_util_internal.h similarity index 100% rename from tf-psa-crypto/core/psa_util_internal.h rename to tf-psa-crypto/drivers/builtin/src/psa_util_internal.h