Migrate 32-bit TAPackageMaker to OpenSSL3

Change-Id: Ia14cf23418f15b203d7dc7de2b5134aa3b23c4ca

diff --git a/PackageMaker/TAPackageMaker32 b/PackageMaker/TAPackageMaker32
index 75d5768377427f5db3cc046f9294a29b7f73f3d0..5b0fe703446fc547d0c89ded704c1afcf44a7152 100755 (executable)
Binary files a/PackageMaker/TAPackageMaker32 and b/PackageMaker/TAPackageMaker32 differ

diff --git a/PackageMaker/TA_PackageBuilder.sh b/PackageMaker/TA_PackageBuilder.sh
index df0b5ad6713ba3a9e8e20f2143f8bf0ed4e140c3..6a447a0756b4facaf95541cd9ddc9eda45a1f973 100755 (executable)
--- 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 b29c7df9086a8be1db588575438ecb1b234be131..ca6f768365af21721a46102f80f90e7d48ac140f 100644 (file)
--- 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" />