xtest: 'invoke tests' pTA API from exported include files
Pseudo TA "invoke_tests" now exports its API in the devkit.
Rely on it rather than locally duplicating the API.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/host/xtest/xtest_1000.c b/host/xtest/xtest_1000.c
index 7b3956f..785d434 100644
--- a/host/xtest/xtest_1000.c
+++ b/host/xtest/xtest_1000.c
@@ -23,6 +23,7 @@
#include "xtest_helpers.h"
#include <signed_hdr.h>
+#include <pta_invoke_tests.h>
#include <ta_crypt.h>
#include <ta_os_test.h>
#include <ta_create_fail_test.h>
@@ -259,9 +260,7 @@
TEEC_Session session = { 0 };
uint32_t ret_orig;
-#define CMD_SELF_TESTS 2
-
- res = xtest_teec_open_session(&session, &sta_test_ta_uuid, NULL,
+ res = xtest_teec_open_session(&session, &pta_invoke_tests_ta_uuid, NULL,
&ret_orig);
/*
* If the static TA (which is optional) isn't available, skip this
@@ -271,7 +270,7 @@
return;
(void)ADBG_EXPECT_TEEC_SUCCESS(c, TEEC_InvokeCommand(
- &session, CMD_SELF_TESTS, NULL, &ret_orig));
+ &session, PTA_INVOKE_TESTS_CMD_SELF_TESTS, NULL, &ret_orig));
TEEC_CloseSession(&session);
}
diff --git a/host/xtest/xtest_test.c b/host/xtest/xtest_test.c
index 656136d..9698de4 100644
--- a/host/xtest/xtest_test.c
+++ b/host/xtest/xtest_test.c
@@ -12,6 +12,7 @@
*/
#include "xtest_test.h"
+#include <pta_invoke_tests.h>
#include <tee_client_api.h>
#include <ta_create_fail_test.h>
#include <ta_crypt.h>
@@ -85,16 +86,11 @@
{ 0xf34f4f3c, 0xab30, 0x4573, \
{ 0x91, 0xBF, 0x3C, 0x57, 0x02, 0x4D, 0x51, 0x99 } }
-#define STA_SELF_TEST_UUID \
- { 0xd96a5b40, 0xc3e5, 0x21e3, \
- { 0x87, 0x94, 0x10, 0x02, 0xa5, 0xd5, 0xc6, 0x1b } }
-
-
const TEEC_UUID crypt_user_ta_uuid = TA_CRYPT_UUID;
const TEEC_UUID os_test_ta_uuid = TA_OS_TEST_UUID;
const TEEC_UUID create_fail_test_ta_uuid = TA_CREATE_FAIL_TEST_UUID;
const TEEC_UUID ecc_test_ta_uuid = ECC_SELF_TEST_UUID;
-const TEEC_UUID sta_test_ta_uuid = STA_SELF_TEST_UUID;
+const TEEC_UUID pta_invoke_tests_ta_uuid = PTA_INVOKE_TESTS_UUID;
const TEEC_UUID rpc_test_ta_uuid = TA_RPC_TEST_UUID;
const TEEC_UUID sims_test_ta_uuid = TA_SIMS_TEST_UUID;
const TEEC_UUID storage_ta_uuid = TA_STORAGE_UUID;
diff --git a/host/xtest/xtest_test.h b/host/xtest/xtest_test.h
index 95c8b52..6bc7159 100644
--- a/host/xtest/xtest_test.h
+++ b/host/xtest/xtest_test.h
@@ -121,7 +121,7 @@
extern const TEEC_UUID storage2_ta_uuid;
extern const TEEC_UUID enc_fs_key_manager_test_ta_uuid;
extern const TEEC_UUID ecc_test_ta_uuid;
-extern const TEEC_UUID sta_test_ta_uuid;
+extern const TEEC_UUID pta_invoke_tests_ta_uuid;
extern const TEEC_UUID gp_tta_time_uuid;
extern const TEEC_UUID concurrent_ta_uuid;
extern const TEEC_UUID concurrent_large_ta_uuid;