Compilation fixes for OpTEE.

Change-Id: Ia33a87899975e1793efefa2d1778aaba8c2f9fa0

diff --git a/ta/include/internal.h b/ta/include/internal.h
index 0250a3b2033c654b6dc16f81af3cf8626064a2af..34f217f1ba8c669d85c5f96e643c5794d8d890c2 100644 (file)
--- a/ta/include/internal.h
+++ b/ta/include/internal.h
@@ -26,6 +26,12 @@
 #include <tee_internal_api.h>
 #include <km_serialization.h>
 
+#ifdef S_VAR_NOT_USED
+#undef S_VAR_NOT_USED
+#endif // S_VAR_NOT_USED
+
+#define S_VAR_NOT_USED(variable) (void)(variable);
+
 #ifdef TEF_BUILD_SIMULATOR
 #define TEE_ALG_AES_CTR TEE_ALG_AES_CTR_NOPAD
 #endif // TEF_BUILD_SIMULATOR

diff --git a/ta/src/internal.c b/ta/src/internal.c
index d765ae9411c0a59c4ca70a80bac8ea0fcdeb97c5..b5f10cdbd4fcf6d7002c0670a6abb349e3b95ba4 100644 (file)
--- a/ta/src/internal.c
+++ b/ta/src/internal.c
@@ -288,6 +288,10 @@ TEE_Result KM_DecryptImportedData(
                KM_BinaryData *input,
                KM_BinaryData *output)
 {
+       S_VAR_NOT_USED(iv);
+       S_VAR_NOT_USED(tag);
+       S_VAR_NOT_USED(input);
+       S_VAR_NOT_USED(output);
        LOG("This version of key-manager-ta application does not support import of encrypted values.");
        return TEE_ERROR_NOT_SUPPORTED;
 }

diff --git a/ta/src/km_ta.c b/ta/src/km_ta.c
index 426db1a29519e48d98ca3ac246e16cde6971a276..4748a53df6c7c0216ae0de036c5c7f37a61b3ae5 100644 (file)
--- a/ta/src/km_ta.c
+++ b/ta/src/km_ta.c
@@ -26,12 +26,6 @@
 #include <log.h>
 #include <internal.h>
 
-#ifdef S_VAR_NOT_USED
-#undef S_VAR_NOT_USED
-#endif // S_VAR_NOT_USED
-
-#define S_VAR_NOT_USED(variable) do { (void)(variable); } while (0);
-
 TEE_Result TA_CreateEntryPoint(void)
 {
        return TEE_SUCCESS;