xtest 20xxx: fix against deprecated CFG_ENC_FS
CFG_ENC_FS is no more supported. Secure storage encryption is assume
always enable.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>
diff --git a/host/xtest/xtest_20000.c b/host/xtest/xtest_20000.c
index ce2bc2a..3efb4af 100644
--- a/host/xtest/xtest_20000.c
+++ b/host/xtest/xtest_20000.c
@@ -11,7 +11,7 @@
* GNU General Public License for more details.
*/
-#if defined(CFG_ENC_FS) && defined(CFG_REE_FS)
+#if defined(CFG_REE_FS)
#include <stdlib.h>
#include <string.h>
@@ -26,6 +26,8 @@
#include <tee_fs_key_manager.h>
#include <tee_client_api.h>
+#include <tee_api_defines_extensions.h>
+
#include <ta_storage.h>
#include <tee_api_defines.h>
#include <tee_api_types.h>
@@ -129,7 +131,7 @@
op.params[0].tmpref.size = id_size;
op.params[1].value.a = flags;
op.params[1].value.b = 0;
- op.params[2].value.a = TEE_STORAGE_PRIVATE;
+ op.params[2].value.a = TEE_STORAGE_PRIVATE_REE;
op.paramTypes = TEEC_PARAM_TYPES(
TEEC_MEMREF_TEMP_INPUT, TEEC_VALUE_INOUT, TEEC_VALUE_INPUT,
@@ -157,7 +159,7 @@
op.params[1].value.a = flags;
op.params[1].value.b = 0;
op.params[2].value.a = attr;
- op.params[2].value.b = TEE_STORAGE_PRIVATE;
+ op.params[2].value.b = TEE_STORAGE_PRIVATE_REE;
op.params[3].tmpref.buffer = data;
op.params[3].tmpref.size = data_size;
@@ -833,4 +835,4 @@
"Description of how to implement ..."
);
-#endif /* defined(CFG_ENC_FS) && defined(CFG_REE_FS) */
+#endif /* defined(CFG_REE_FS) */
diff --git a/host/xtest/xtest_main.c b/host/xtest/xtest_main.c
index d19384a..3f945e6 100644
--- a/host/xtest/xtest_main.c
+++ b/host/xtest/xtest_main.c
@@ -96,7 +96,8 @@
#endif /*USER_SPACE*/
ADBG_SUITE_ENTRY(XTEST_TEE_10001, NULL)
ADBG_SUITE_ENTRY(XTEST_TEE_10002, NULL)
-#if defined(CFG_ENC_FS) && defined(CFG_REE_FS)
+
+#if defined(CFG_REE_FS)
ADBG_SUITE_ENTRY(XTEST_TEE_20001, NULL)
ADBG_SUITE_ENTRY(XTEST_TEE_20002, NULL)
ADBG_SUITE_ENTRY(XTEST_TEE_20003, NULL)
@@ -111,7 +112,7 @@
ADBG_SUITE_ENTRY(XTEST_TEE_20521, NULL)
ADBG_SUITE_ENTRY(XTEST_TEE_20522, NULL)
ADBG_SUITE_ENTRY(XTEST_TEE_20523, NULL)
-#endif /* defined(CFG_ENC_FS) && defined(CFG_REE_FS) */
+#endif /* defined(CFG_REE_FS) */
ADBG_SUITE_DEFINE_END()
diff --git a/host/xtest/xtest_test.h b/host/xtest/xtest_test.h
index d3fe081..b3f8c22 100644
--- a/host/xtest/xtest_test.h
+++ b/host/xtest/xtest_test.h
@@ -84,7 +84,7 @@
ADBG_CASE_DECLARE(XTEST_TEE_10001);
ADBG_CASE_DECLARE(XTEST_TEE_10002);
-#if defined(CFG_ENC_FS) && defined(CFG_REE_FS)
+#if defined(CFG_REE_FS)
ADBG_CASE_DECLARE(XTEST_TEE_20001);
ADBG_CASE_DECLARE(XTEST_TEE_20002);
ADBG_CASE_DECLARE(XTEST_TEE_20003);
@@ -99,7 +99,7 @@
ADBG_CASE_DECLARE(XTEST_TEE_20521);
ADBG_CASE_DECLARE(XTEST_TEE_20522);
ADBG_CASE_DECLARE(XTEST_TEE_20523);
-#endif /* defined(CFG_ENC_FS) && !defined(CFG_ENC_FS) */
+#endif /* defined(CFG_REE_FS) */
ADBG_CASE_DECLARE(XTEST_TEE_BENCHMARK_1001);
ADBG_CASE_DECLARE(XTEST_TEE_BENCHMARK_1002);