Restore GPD_TEE_PROP file

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4f87cc..bee36de 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,6 +54,7 @@ ADD_DEFINITIONS(-DTEE_EXTRACT_ROOT="${EXTRACT_DIR}/")
 ADD_DEFINITIONS(-DTEE_SS_ROOT="${STORAGE_DIR}/")
 ADD_DEFINITIONS(-DTEE_TALOG_ROOT="${TALOG_DIR}/")
 ADD_DEFINITIONS(-DTEE_USER_GROUP_NAME="${TEE_USER_GROUP_NAME}")
+ADD_DEFINITIONS(-DTEE_DATA_DIR="${TEE_DATA_DIR}")
 
 # Enable tizen-specific preprocessor defines
 IF(DEFINED TIZEN)

diff --git a/include/include/config.h b/include/include/config.h
index 4489365..a5d863c 100644 (file)
--- a/include/include/config.h
+++ b/include/include/config.h
@@ -59,6 +59,6 @@
 // should be identified by a name of the form /somename
 #define SHM_NAME_PREFIX  "/teec_shm"
 
-#define TEE_PROP_PATH "/usr/bin/GPD_TEE_PROP"
+#define TEE_PROP_PATH TEE_DATA_DIR "/GPD_TEE_PROP"
 
 #endif /* INCLUDE_CONFIG_H_ */

diff --git a/packaging/tef-simulator.spec b/packaging/tef-simulator.spec
index 03dfce4..ba0b11a 100644 (file)
--- a/packaging/tef-simulator.spec
+++ b/packaging/tef-simulator.spec
@@ -85,6 +85,7 @@ cmake . \
         -DEXTRACT_DIR=%{extract_dir} \
         -DSTORAGE_DIR=%{storage_dir} \
         -DTALOG_DIR=%{talog_dir} \
+        -DTEE_DATA_DIR=%{data_dir} \
         -DSYSTEMD_UNIT_DIR=%{build_unit_dir} \
         -DSYSTEMD_CFG_BIN_DIR=%{bin_dir} \
         -DPKGCFG_LIB_DIR=%{lib_dir} \
@@ -162,3 +163,4 @@ fi
 %{include_dir}/tee_internal_api.h
 %{lib_dir}/pkgconfig/tef-simulator-devkit.pc
 %{data_dir}/cmake/Modules/TEFSimulatorDevkit.cmake
+%{data_dir}/GPD_TEE_PROP

diff --git a/simulatordaemon/CMakeLists.txt b/simulatordaemon/CMakeLists.txt
index 4c7c494..9fe4d20 100644 (file)
--- a/simulatordaemon/CMakeLists.txt
+++ b/simulatordaemon/CMakeLists.txt
@@ -103,6 +103,7 @@ TARGET_LINK_LIBRARIES(${TARGET_TEF_SIMULATOR_DAEMON}
     )
 
 INSTALL(TARGETS ${TARGET_TEF_SIMULATOR_DAEMON} DESTINATION ${BIN_DIR})
+INSTALL(FILES ${DAEMON_PATH}/share/GPD_TEE_PROP DESTINATION ${DATA_DIR})
 
 INSTALL(DIRECTORY DESTINATION ${BUILD_ROOT}${TASTORE_DIR})
 INSTALL(DIRECTORY DESTINATION ${BUILD_ROOT}${EXTRACT_DIR})

diff --git a/simulatordaemon/share/GPD_TEE_PROP b/simulatordaemon/share/GPD_TEE_PROP
new file mode 100644 (file)
index 0000000..f744cc6
--- /dev/null
+++ b/simulatordaemon/share/GPD_TEE_PROP
@@ -0,0 +1,67 @@
+<teeproperties>
+       <property name="gpd.tee.apiversion" 
+       type="string" 
+       value="1.1"/>
+
+       <property name="gpd.tee.description" 
+       type="string" 
+       value="Samsung Secure OS Simulator for TA SDK IDE (C) 2015"/>
+
+       <property name="gpd.tee.deviceID" 
+       type="uuid" 
+       value="00000000-0000-4000-0000-0000000000FF"/>
+
+       <property name="gpd.tee.systemTime.protectionLevel" 
+       type="integer"
+       value="0"/>
+
+       <property name="gpd.tee.TAPersistentTime.protectionLevel" 
+       type="integer"
+       value="0"
+       />
+
+       <property name="gpd.tee.arith.maxBigIntSize" 
+       type="integer"
+       value="2048"
+       />
+
+       <property name="gpd.tee.cryptography.ecc" 
+       type="boolean"
+       value="false"
+       />
+
+       <property name="gpd.tee.trustedStorage.antiRollback.protectionLevel" 
+       type="integer"
+       value="0"
+       />
+
+       <property name="gpd.tee.trustedos.implementation.version" 
+       type="string"
+       value="0.9"
+       />
+
+       <property name="gpd.tee.trustedos.implementation.binaryversion" 
+       type="binary"
+       value="checksum"
+       />
+
+       <property name="gpd.tee.trustedos.manufacturer" 
+       type="string"
+       value="Samsung Electronics (C) 2015"
+       />
+
+       <property name="gpd.tee.firmware.implementation.version" 
+       type="string"
+       value="0.1"
+       />
+
+       <property name="gpd.tee.firmware.implementation.binaryversion" 
+       type="binary"
+       value="checksum"
+       />
+
+       <property name="gpd.tee.firmware.manufacturer" 
+       type="string"
+       value="Samsung Electronics (C) 2015"
+       />
+</teeproperties>