Use new semantics for devkit TA configuration

The devkit now accepts a base directory to all backend-specific
configurations.

Change-Id: Ib8068d70651607f3a1d8600e290a8934262a4f8b
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>

diff --git a/ta/CMakeLists.txt b/ta/CMakeLists.txt
index f5eb2c68d754ce42d3b2f04e7be70fe1174eeeb2..9958e3fc0a9667cfce924da3cfac02a36ca3ea51 100644 (file)
--- a/ta/CMakeLists.txt
+++ b/ta/CMakeLists.txt
@@ -63,6 +63,6 @@ TARGET_LINK_LIBRARIES(${TARGET_KEY_MANAGER_TA}
     ${KEY_MANAGER_TA_DEPS_STATIC_LIBRARIES}
     )
 
-GENERATE_TA_IMAGE(SIGNED_TA ${TARGET_KEY_MANAGER_TA} ${KEY_MANAGER_TA_PATH}/km_ta.xml ${TA_NAME})
+GENERATE_TA_IMAGE(SIGNED_TA ${TARGET_KEY_MANAGER_TA} ${KEY_MANAGER_TA_PATH}/backends ${TA_NAME})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TA_NAME} DESTINATION ${TASTORE_DIR})
 INSTALL(FILES ${KEY_MANAGER_TA_HEADERS} DESTINATION ${INCLUDE_DIR})

diff --git a/ta/backends/simulator/manifest.xml b/ta/backends/simulator/manifest.xml
new file mode 100644 (file)
index 0000000..6207e0e
--- /dev/null
+++ b/ta/backends/simulator/manifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns="http://www.samsungdforum.com/ns/packages">
+    <properties>
+        <!-- Trusted Application Configuration Properties GPD TEE Internal API Specification v1.0 -->
+        <general
+            appID="00000000-0000-0000-0000-666666555555"
+            singleInstance="true"
+            multiSession="true"
+            instanceKeepAlive="false"
+            stackSize="4096"
+            dataSize="4096"/>
+
+        <!-- Extended TEE specific -->
+        <extension
+            appName="key-manager"
+            appVersion="1"
+            type="application"
+            zone="internal"
+            sdkVersion="2.0"
+            launchMode="release"/>
+    </properties>
+    <!-- Access Control Policy -->
+    <policy>
+        <privilege name="platform"/>
+        <protectionDomain>
+            <createDomain name="keymanagerta"/>
+            <allowedDomain name="keymanagerta"/>
+        </protectionDomain>
+
+        <permission>
+            <uses-permission name="system.permission.STORAGE" />
+            <uses-permission name="system.permission.CRYPTO" />
+        </permission>
+    </policy>
+    <information>
+        <description> "Key manager Trusted Application." </description>
+        <author> "Samsung Electronics" </author>
+        <terms> "This sample Application is provided as is. All rights reserved." </terms>
+        <copyright> "Copyright (c) 2017 Samsung Electronics" </copyright>
+    </information>
+
+</manifest>

diff --git a/ta/km_ta.xml b/ta/km_ta.xml
deleted file mode 100644 (file)
index 6207e0e..0000000
--- a/ta/km_ta.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns="http://www.samsungdforum.com/ns/packages">
-    <properties>
-        <!-- Trusted Application Configuration Properties GPD TEE Internal API Specification v1.0 -->
-        <general
-            appID="00000000-0000-0000-0000-666666555555"
-            singleInstance="true"
-            multiSession="true"
-            instanceKeepAlive="false"
-            stackSize="4096"
-            dataSize="4096"/>
-
-        <!-- Extended TEE specific -->
-        <extension
-            appName="key-manager"
-            appVersion="1"
-            type="application"
-            zone="internal"
-            sdkVersion="2.0"
-            launchMode="release"/>
-    </properties>
-    <!-- Access Control Policy -->
-    <policy>
-        <privilege name="platform"/>
-        <protectionDomain>
-            <createDomain name="keymanagerta"/>
-            <allowedDomain name="keymanagerta"/>
-        </protectionDomain>
-
-        <permission>
-            <uses-permission name="system.permission.STORAGE" />
-            <uses-permission name="system.permission.CRYPTO" />
-        </permission>
-    </policy>
-    <information>
-        <description> "Key manager Trusted Application." </description>
-        <author> "Samsung Electronics" </author>
-        <terms> "This sample Application is provided as is. All rights reserved." </terms>
-        <copyright> "Copyright (c) 2017 Samsung Electronics" </copyright>
-    </information>
-
-</manifest>