summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilip Skrzeczkowski <f.skrzeczkow@samsung.com>2023-11-21 11:54:11 +0100
committerFilip Skrzeczkowski <f.skrzeczkow@samsung.com>2023-11-22 13:52:47 +0100
commit936b02d5db9e0894969cae11a421bc7a0e4a8bb6 (patch)
tree87853cacee3de1da4dc979debe8f993189ffde3e
parentbd852bb3aa43af9994afc2118f7ba60d3fa15e8b (diff)
downloadtef-simulator-tizen.tar.gz
tef-simulator-tizen.tar.bz2
tef-simulator-tizen.zip
Migrate 32-bit TAPackageMaker to OpenSSL3tizen
Change-Id: Ia14cf23418f15b203d7dc7de2b5134aa3b23c4ca
-rwxr-xr-xPackageMaker/TAPackageMaker32bin525080 -> 372312 bytes
-rwxr-xr-xPackageMaker/TA_PackageBuilder.sh19
-rw-r--r--helloworld/ta/hello_world.xml2
3 files changed, 11 insertions, 10 deletions
diff --git a/PackageMaker/TAPackageMaker32 b/PackageMaker/TAPackageMaker32
index 75d5768..5b0fe70 100755
--- a/PackageMaker/TAPackageMaker32
+++ b/PackageMaker/TAPackageMaker32
Binary files differ
diff --git a/PackageMaker/TA_PackageBuilder.sh b/PackageMaker/TA_PackageBuilder.sh
index df0b5ad..6a447a0 100755
--- a/PackageMaker/TA_PackageBuilder.sh
+++ b/PackageMaker/TA_PackageBuilder.sh
@@ -18,12 +18,12 @@ function func_make_package()
if [ "$TA_LAUNCH_MODE" = "debug" ]
then
#TA Packaging
- $TA_SYS_PASS/TAPackageMaker $INPUT_IMAGE_NAME $INPUT_IMAGE_MANIFEST $TA_CERTIFICATE $TA_PRIVATE_KEY
+ $TA_SYS_PASS/TAPackageMaker Simulator $INPUT_IMAGE_NAME $INPUT_IMAGE_MANIFEST ./ ./$TA_KEYFOLDER/
elif [ "$TA_LAUNCH_MODE" = "release" ]
then
echo "Release building unimplemented"
#TA Packaging
- $TA_SYS_PASS/TAPackageMaker $INPUT_IMAGE_NAME $INPUT_IMAGE_MANIFEST $TA_CERTIFICATE $TA_PRIVATE_KEY
+ $TA_SYS_PASS/TAPackageMaker Simulator $INPUT_IMAGE_NAME $INPUT_IMAGE_MANIFEST ./ ./$TA_KEYFOLDER/
else
echo "LAUNCH_MODE Error.!!!"
exit -1
@@ -62,26 +62,27 @@ function func_package_build()
if [ "$TA_LAUNCH_MODE" = "debug" ]
then
- TA_KEYFOLDER=keystore/debug/
+ TA_KEYFOLDER=keystore/debug
elif [ "$TA_LAUNCH_MODE" = "release" ]
then
- TA_KEYFOLDER=keystore/$TA_PRIVILEGE/
+ TA_KEYFOLDER=keystore/$TA_PRIVILEGE
else
echo "LAUNCH_MODE Error.!!!"
exit -1
fi
- export TA_PRIVATE_KEY=$TA_KEYFOLDER/Kaa_private.pem
- export TA_CERTIFICATE_CSR=$TA_KEYFOLDER/Kaa_csr.pem
- export TA_CERTIFICATE=$TA_KEYFOLDER/Kaa_cert.pem
+ export TA_PRIVATE_KEY=$TA_KEYFOLDER/sim_${TA_PRIVILEGE}_kaa_private.pem
+ export TA_CERTIFICATE_CSR=$TA_KEYFOLDER/sim_${TA_PRIVILEGE}_kaa_csr.pem
+ export TA_CERTIFICATE=$TA_KEYFOLDER/sim_${TA_PRIVILEGE}_kaa_cert.pem
- mkdir -p $TA_KEYFOLDER
+ mkdir -p $TA_KEYFOLDER/
- if [ -f $TA_KEYFOLDER/Kaa_cert.pem ]
+ if [ -f $TA_CERTIFICATE ]
then
echo "Certificate exists."
else
echo "Certificate does NOT exist."
+ echo $TA_CERTIFICATE
func_create_certificate
fi
diff --git a/helloworld/ta/hello_world.xml b/helloworld/ta/hello_world.xml
index b29c7df..ca6f768 100644
--- a/helloworld/ta/hello_world.xml
+++ b/helloworld/ta/hello_world.xml
@@ -21,7 +21,7 @@
</properties>
<!-- Access Control Policy -->
<policy>
- <privilege name = "tef-simulator-helloworld" />
+ <privilege name = "public" />
<protectionDomain>
<createDomain name = "testtefsimulator" />
<allowedDomain name = "testtefsimulator" />