Rename libpsa to libpsats
Instead of using a generic name for the library, give it a TS specific
name to avoid possible naming collisions with other psa libraries in
the future.
Change-Id: Icea9be4d836f7d22300b20c8d6a5f8bd8fae1133
Signed-off-by: Gabor Toth <gabor.toth2@arm.com>
diff --git a/deployments/psa-api-test/crypto/crypto.c b/deployments/psa-api-test/crypto/crypto.c
index 9cbc67b..612012d 100644
--- a/deployments/psa-api-test/crypto/crypto.c
+++ b/deployments/psa-api-test/crypto/crypto.c
@@ -5,7 +5,7 @@
*/
#include "../psa_api_test_common.h"
-#include "libpsa.h"
+#include "libpsats.h"
#include "trace.h"
psa_status_t test_setup(const char *service_name_crypto, const char *service_name_iat,
@@ -16,9 +16,9 @@
if (!service_name_crypto)
service_name_crypto = "sn:trustedfirmware.org:crypto:0";
- psa_status = libpsa_init_crypto_context(service_name_crypto);
+ psa_status = libpsats_init_crypto_context(service_name_crypto);
if (psa_status) {
- EMSG("libpsa_init_crypto_context failed: %d\n", psa_status);
+ EMSG("libpsats_init_crypto_context failed: %d\n", psa_status);
return psa_status;
}
@@ -33,5 +33,5 @@
void test_teardown(void)
{
- libpsa_deinit_crypto_context();
+ libpsats_deinit_crypto_context();
}
diff --git a/deployments/psa-api-test/initial_attestation/iat.c b/deployments/psa-api-test/initial_attestation/iat.c
index eb03dc7..438bb58 100644
--- a/deployments/psa-api-test/initial_attestation/iat.c
+++ b/deployments/psa-api-test/initial_attestation/iat.c
@@ -5,7 +5,7 @@
*/
#include "../psa_api_test_common.h"
-#include "libpsa.h"
+#include "libpsats.h"
#include "trace.h"
psa_status_t test_setup(const char *service_name_crypto, const char *service_name_iat,
@@ -19,15 +19,15 @@
if (!service_name_iat)
service_name_iat = "sn:trustedfirmware.org:attestation:0";
- psa_status = libpsa_init_crypto_context(service_name_crypto);
+ psa_status = libpsats_init_crypto_context(service_name_crypto);
if (psa_status) {
- EMSG("libpsa_init_crypto_context failed: %d\n", psa_status);
+ EMSG("libpsats_init_crypto_context failed: %d\n", psa_status);
return psa_status;
}
- psa_status = libpsa_init_attestation_context(service_name_iat);
+ psa_status = libpsats_init_attestation_context(service_name_iat);
if (psa_status) {
- EMSG("libpsa_init_attestation_context failed: %d\n", psa_status);
+ EMSG("libpsats_init_attestation_context failed: %d\n", psa_status);
return psa_status;
}
@@ -42,6 +42,6 @@
void test_teardown(void)
{
- libpsa_deinit_crypto_context();
- libpsa_deinit_attestation_context();
+ libpsats_deinit_crypto_context();
+ libpsats_deinit_attestation_context();
}
diff --git a/deployments/psa-api-test/internal_trusted_storage/its.c b/deployments/psa-api-test/internal_trusted_storage/its.c
index 9f3860b..38b3d58 100644
--- a/deployments/psa-api-test/internal_trusted_storage/its.c
+++ b/deployments/psa-api-test/internal_trusted_storage/its.c
@@ -5,7 +5,7 @@
*/
#include "../psa_api_test_common.h"
-#include "libpsa.h"
+#include "libpsats.h"
#include "trace.h"
psa_status_t test_setup(const char *service_name_crypto, const char *service_name_iat,
@@ -16,9 +16,9 @@
if (!service_name_its)
service_name_its = "sn:trustedfirmware.org:internal-trusted-storage:0";
- psa_status = libpsa_init_its_context(service_name_its);
+ psa_status = libpsats_init_its_context(service_name_its);
if (psa_status) {
- EMSG("libpsa_init_its_context failed: %d\n", psa_status);
+ EMSG("libpsats_init_its_context failed: %d\n", psa_status);
return psa_status;
}
@@ -27,5 +27,5 @@
void test_teardown(void)
{
- libpsa_deinit_its_context();
+ libpsats_deinit_its_context();
}
diff --git a/deployments/psa-api-test/protected_storage/ps.c b/deployments/psa-api-test/protected_storage/ps.c
index c20a860..2f0a800 100644
--- a/deployments/psa-api-test/protected_storage/ps.c
+++ b/deployments/psa-api-test/protected_storage/ps.c
@@ -5,7 +5,7 @@
*/
#include "../psa_api_test_common.h"
-#include "libpsa.h"
+#include "libpsats.h"
#include "trace.h"
psa_status_t test_setup(const char *service_name_crypto, const char *service_name_iat,
@@ -16,9 +16,9 @@
if (!service_name_ps)
service_name_ps = "sn:trustedfirmware.org:protected-storage:0";
- psa_status = libpsa_init_ps_context(service_name_ps);
+ psa_status = libpsats_init_ps_context(service_name_ps);
if (psa_status) {
- EMSG("libpsa_init_ps_context failed: %d\n", psa_status);
+ EMSG("libpsats_init_ps_context failed: %d\n", psa_status);
return psa_status;
}
@@ -27,5 +27,5 @@
void test_teardown(void)
{
- libpsa_deinit_ps_context();
+ libpsats_deinit_ps_context();
}
diff --git a/deployments/psa-api-test/psa-api-test.cmake b/deployments/psa-api-test/psa-api-test.cmake
index 021d431..b005e26 100644
--- a/deployments/psa-api-test/psa-api-test.cmake
+++ b/deployments/psa-api-test/psa-api-test.cmake
@@ -20,17 +20,17 @@
)
#-------------------------------------------------------------------------------
-# Use libpsa for locating PSA services. An appropriate version of
-# libpsa will be imported for the environment. Making sure the link order is
+# Use libpsats for locating PSA services. An appropriate version of
+# libpsats will be imported for the environment. Making sure the link order is
# correct.
#-------------------------------------------------------------------------------
if (COVERAGE)
- set(LIBPSA_BUILD_TYPE "DEBUGCOVERAGE" CACHE STRING "Libpsa build type" FORCE)
+ set(LIBPSATS_BUILD_TYPE "DEBUGCOVERAGE" CACHE STRING "Libpsats build type" FORCE)
set(LIBTS_BUILD_TYPE "DEBUGCOVERAGE" CACHE STRING "Libts build type" FORCE)
endif()
-include(${TS_ROOT}/deployments/libpsa/libpsa-import.cmake)
-target_link_libraries( ${PROJECT_NAME} PRIVATE libpsa::psa)
+include(${TS_ROOT}/deployments/libpsats/libpsats-import.cmake)
+target_link_libraries( ${PROJECT_NAME} PRIVATE libpsats::psats)
target_link_libraries(${PROJECT_NAME} PRIVATE val_nspe test_combine pal_nspe)