From: Kyungwook Tak Date: Tue, 24 Jan 2017 11:34:20 +0000 (+0900) Subject: [UTC][key-manager][Non-ACR] Change resource path X-Git-Tag: 4.0_Bringup~86^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1c980b10a2b20dcc4acde93acb21e9f294a4839;p=test%2Ftct%2Fnative%2Fapi.git [UTC][key-manager][Non-ACR] Change resource path Some resources had been installed in RO side(/usr/share/). Move all resources to app data directory and access it by app_get_data_path(). Change-Id: Iba42e1d28492c33781acc130be1ccb6677a0728f Signed-off-by: Kyungwook Tak --- diff --git a/packaging/utc/core-key-manager-tests.spec b/packaging/utc/core-key-manager-tests.spec index 74825ad8f..ae6b0c0fb 100755 --- a/packaging/utc/core-key-manager-tests.spec +++ b/packaging/utc/core-key-manager-tests.spec @@ -66,15 +66,17 @@ mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/%{name} mkdir -p %{buildroot}/usr/share/packages/ cp packaging/utc/%{name}.xml %{buildroot}/usr/share/packages/ -mkdir -p %{buildroot}/usr/apps/%{name}/bin +mkdir -p %{buildroot}%{APP_PATH}%{name}/data +cp src/utc/key-manager/data/* %{buildroot}%{APP_PATH}%{name}/data/ +mkdir -p %{buildroot}/etc/ssl/certs +cp src/utc/key-manager/data/dfb08fe4.0 %{buildroot}/etc/ssl/certs/ %post chsmack -a "_" /etc/ssl/certs/dfb08fe4.0 -chsmack -a "_" /usr/share/utc_key-manager/* +chsmack -a "_" %{APP_PATH}%{name}/data %files -/usr/apps/%{name}/* +%{APP_PATH}%{name}/* /usr/share/packages/%{name}.xml /usr/share/license/%{name} /etc/ssl/certs/dfb08fe4.0 -/usr/share/utc_key-manager/* diff --git a/scripts_tpk/spec.sh b/scripts_tpk/spec.sh index 85fe71873..ea9ba57ce 100755 --- a/scripts_tpk/spec.sh +++ b/scripts_tpk/spec.sh @@ -160,20 +160,16 @@ case "$1" in ;; "org.tizen.key-manager-native-utc") echo "Installing pre-requisites for the package $1" - mkdir -p /usr/share/utc_key-manager - chsmack -a "User::App::Shared" /usr/share/utc_key-manager - chsmack -e "User::App::Shared" /usr/share/utc_key-manager - cp res/p12_for_loadtest.p12 /usr/share/utc_key-manager/p12_for_loadtest.p12 - cp res/invalid_p12_for_loadtest.p12 /usr/share/utc_key-manager/invalid_p12_for_loadtest.p12 - cp res/cert_for_loadtest.pem /usr/share/utc_key-manager/cert_for_loadtest.pem - cp res/invalid_cert_for_loadtest.pem /usr/share/utc_key-manager/invalid_cert_for_loadtest.pem - cp res/pkcs.p12 /usr/share/utc_key-manager/pkcs.p12 - cp res/dfb08fe4.0 /etc/ssl/certs/dfb08fe4.0 - chown -R 5000:5000 /usr/share/utc_key-manager - chmod -R 777 /usr/share/utc_key-manager + mkdir -p $APP_DATA_DIR + chsmack -a "User::App::Shared" $APP_DATA_DIR + chsmack -e "User::App::Shared" $APP_DATA_DIR + cp data/* $APP_DATA_DIR/ + cp data/dfb08fe4.0 /etc/ssl/certs/dfb08fe4.0 + chown -R 5000:5000 $APP_DATA_DIR + chmod -R 777 $APP_DATA_DIR chsmack -a "_" /etc/ssl/certs/dfb08fe4.0 - chsmack -a "User::App::Shared" /usr/share/utc_key-manager/* - chsmack -e "User::App::Shared" /usr/share/utc_key-manager/* + chsmack -a "User::App::Shared" $APP_DATA_DIR/* + chsmack -e "User::App::Shared" $APP_DATA_DIR/* ;; "org.tizen.capi-message-port-native-itc") echo "Installing pre-requisites for the package $1" diff --git a/src/utc/key-manager/CMakeLists.txt b/src/utc/key-manager/CMakeLists.txt index 8bae2250a..412d4f362 100755 --- a/src/utc/key-manager/CMakeLists.txt +++ b/src/utc/key-manager/CMakeLists.txt @@ -8,6 +8,7 @@ SET(TC_SOURCES utc-key-manager-crypto.c utc-key-manager-storage.c utc-key-manager-type.c + res-util.c ) PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED @@ -32,16 +33,6 @@ INSTALL(PROGRAMS ${EXEC_NAME} DESTINATION ${BIN_DIR}/${RPM_NAME}/bin ) -INSTALL(FILES res/dfb08fe4.0 DESTINATION /etc/ssl/certs/) - -INSTALL(FILES - res/pkcs.p12 - res/cert_for_loadtest.pem - res/invalid_cert_for_loadtest.pem - res/invalid_p12_for_loadtest.p12 - res/p12_for_loadtest.p12 - DESTINATION /usr/share/utc_key-manager/) - IF( DEFINED ASAN ) SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC -Wall -pie -g -fsanitize=address -fsanitize-recover=address -U_FORTIFY_SOURCE -fno-omit-frame-pointer") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib -Wl,-fsanitize=address") diff --git a/src/utc/key-manager/data/cert_for_loadtest.pem b/src/utc/key-manager/data/cert_for_loadtest.pem new file mode 100755 index 000000000..3925deb8d --- /dev/null +++ b/src/utc/key-manager/data/cert_for_loadtest.pem @@ -0,0 +1,34 @@ +-----BEGIN CERTIFICATE----- +MIIF0TCCBLmgAwIBAgIQaPGTP4aS7Ut/WDNaBzdQrDANBgkqhkiG9w0BAQUFADCB +ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug +YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr +VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x +NDAyMjAwMDAwMDBaFw0xNTAyMjAyMzU5NTlaMIHmMRMwEQYLKwYBBAGCNzwCAQMT +AlBMMR0wGwYDVQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGA1UEBRMKMDAw +MDAyNTIzNzELMAkGA1UEBhMCUEwxDzANBgNVBBEUBjAwLTk1MDEUMBIGA1UECBML +bWF6b3dpZWNraWUxETAPBgNVBAcUCFdhcnN6YXdhMRYwFAYDVQQJFA1TZW5hdG9y +c2thIDE4MRMwEQYDVQQKFAptQmFuayBTLkEuMQwwCgYDVQQLFANESU4xGTAXBgNV +BAMUEHd3dy5tYmFuay5jb20ucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK +AoIBAQDph6x8V6xUW/+651+qHF+UmorH9uaz2ZrX2bIWiMKIJFmpDDHlxcapKkqE +BV04is83aiCpqKtc2ZHy2g4Hpj1eSF5BP2+OAlo0YUQZPIeRRdiMjmeAxw/ncBDx +9rQBuCJ4XTD6cqQox5SI0TASOZ+wyAEjbDRXzL73XqRAFZ1LOpb2ONkolS+RutMB +vshvCsWPeNe7eGLuOh6DyC6r1vX9xhw3xnjM2mTSvmtimgzSLacNGKqRrsucUgcb +0+O5C2jZAtAMLyZksL92cxmWbtVzUYzem4chjHu5cRxUlPNzUJWrrczueB7Ip4A8 +aQuFMfNXYc0x+WLWjy//urypMKjhAgMBAAGjggGjMIIBnzAbBgNVHREEFDASghB3 +d3cubWJhbmsuY29tLnBsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud +JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBEBgNVHSAEPTA7MDkGC2CGSAGG+EUB +BxcGMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMw +HQYDVR0OBBYEFN37iGaS7mZnENxZ9FGqNLR+QgoMMB8GA1UdIwQYMBaAFPyKULqe +uSVae1WFT5UAY4/pWGtDMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3Vy +ZS1jcmwudmVyaXNpZ24uY29tL0VWU2VjdXJlMjAwNi5jcmwwfAYIKwYBBQUHAQEE +cDBuMC0GCCsGAQUFBzABhiFodHRwOi8vRVZTZWN1cmUtb2NzcC52ZXJpc2lnbi5j +b20wPQYIKwYBBQUHMAKGMWh0dHA6Ly9FVlNlY3VyZS1haWEudmVyaXNpZ24uY29t +L0VWU2VjdXJlMjAwNi5jZXIwDQYJKoZIhvcNAQEFBQADggEBAD0wO+rooUrIM4qp +PHhp+hkXK6WMQ2qzGOmbMcZjw0govg5vkzkefPDryIXXbrF8mRagiJNMSfNaWWeh +Cj41OV24EdUl0OLbFxNzcvub599zRs/apfaRLTfsmlmOgi0/YP305i+3tJ2ll946 +P+qV1wXnXqTqEdIl4Ys3+1HmDCdTB1hoDwAAzqRVUXZ5+iiwPAU7R/LTHfMjV1ke +8jtNFfrorlZMCfVH/7eEnHJvVjOJt+YFe4aFMzE+DfuYIK7MH+olC2v79kBwbnEQ +fvHMA9gFwOYLUBBdSfcocp8EKZ+mRlNPGR/3LBrPeaQQ0GZEkxzRK+v/aNTuiYfr +oFXtrg0= +-----END CERTIFICATE----- diff --git a/src/utc/key-manager/data/dfb08fe4.0 b/src/utc/key-manager/data/dfb08fe4.0 new file mode 100755 index 000000000..c349ba3b2 --- /dev/null +++ b/src/utc/key-manager/data/dfb08fe4.0 @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDnzCCAoegAwIBAgIJAMH/ADkC5YSTMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV +BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDARBQ01FMRAwDgYD +VQQLDAdUZXN0aW5nMSEwHwYDVQQDDBhUZXN0IHJvb3QgY2EgY2VydGlmaWNhdGUw +HhcNMTQxMjMwMTcyMTUyWhcNMjQxMjI3MTcyMTUyWjBmMQswCQYDVQQGEwJBVTET +MBEGA1UECAwKU29tZS1TdGF0ZTENMAsGA1UECgwEQUNNRTEQMA4GA1UECwwHVGVz +dGluZzEhMB8GA1UEAwwYVGVzdCByb290IGNhIGNlcnRpZmljYXRlMIIBIjANBgkq +hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0EJRdUtd2th0vTVF7QxvDKzyFCF3w9vC +9IDE/Yr12w+a9jd0s7/eG96qTHIYffS3B7x2MB+d4n+SR3W0qmYh7xk8qfEgH3da +eDoV59IZ9r543KM+g8jm6KffYGX1bIJVVY5OhBRbO9nY6byYpd5kbCIUB6dCf7/W +rQl1aIdLGFIegAzPGFPXDcU6F192686x54bxt/itMX4agHJ9ZC/rrTBIZghVsjJo +5/AH5WZpasv8sfrGiiohAxtieoYoJkv5MOYP4/2lPlOY+Cgw1Yoz+HHv31AllgFs +BquBb/kJVmCCNsAOcnvQzTZUsW/TXz9G2nwRdqI1nSy2JvVjZGsqGQIDAQABo1Aw +TjAdBgNVHQ4EFgQUt6pkzFt1PZlfYRL/HGnufF4frdwwHwYDVR0jBBgwFoAUt6pk +zFt1PZlfYRL/HGnufF4frdwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC +AQEAld7Qwq0cdzDQ51w1RVLwTR8Oy25PB3rzwEHcSGJmdqlMi3xOdaz80S1R1BBX +ldvGBG5Tn0vT7xSuhmSgI2/HnBpy9ocHVOmhtNB4473NieEpfTYrnGXrFxu46Wus +9m/ZnugcQ2G6C54A/NFtvgLmaC8uH8M7gKdS6uYUwJFQEofkjmd4UpOYSqmcRXhS +Jzd5FYFWkJhKJYp3nlENSOD8CUFFVGekm05nFN2gRVc/qaqQkEX77+XYvhodLRsV +qMn7nf7taidDKLO2T4bhujztnTYOhhaXKgPy7AtZ28N2wvX96VyAPB/vrchGmyBK +kOg11TpPdNDkhb1J4ZCh2gupDg== +-----END CERTIFICATE----- diff --git a/src/utc/key-manager/data/invalid_cert_for_loadtest.pem b/src/utc/key-manager/data/invalid_cert_for_loadtest.pem new file mode 100755 index 000000000..0f8164506 --- /dev/null +++ b/src/utc/key-manager/data/invalid_cert_for_loadtest.pem @@ -0,0 +1,28 @@ +-----BEGIN CERTIFICATE----- +MIIF0TCCBLmgAwIBAgIQaPGTP4aS7Ut/WDNaBzdQrDANBgkqhkiG9w0BAQUFADCB +ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL +ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug +YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr +VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x +NDAyMjAwMDAwMDBaFw0xNTAyMjAyMzU5NTlaMIHmMRMwEQYLKwYBBAGCNzwCAQMT +AlBMMR0wGwYDVQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGA1UEBRMKMDAw +MDAyNTIzNzELMAkGA1UEBhMCUEwxDzANBgNVBBEUBjAwLTk1MDEUMBIGA1UECBML +bWF6b3dpZWNraWUxETAPBgNVBAcw3xnjM2mTSvmtimgzSLacNGKqRrsucUgcb +0+O5C2jZAtAMLyZksL92cxmWbtVzUYzem4chjHu5cRxUlPNzUJWrrczueB7Ip4A8 +aQuFMfNXYc0x+WLWjy//urypMKjhAgMBAAGjggGjMIIBnzAbBgNVHREEFDASghB3 +d3cubWJhbmsuY29tLnBsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud +JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBEBgNVHSAEPTA7MDkGC2CGSAGG+EUB +BxcGMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMw +HQYDVR0OBBYEFN37iGaS7mZnENxZ9FGqNLR+QgoMMB8GA1UdIwQYMBaAFPyKULqe +uSVae1WFT5UAY4/pWGtDMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3Vy +ZS1jcmwudmVyaXNpZ24uY29tL0VWU2VjdXJlMjAwNi5jcmwwfAYIKwYBBQUHAQEE +cDBuMC0GCCsG +b20wPQYIKwYBBQUHMAKGMWh0dHA6Ly9FVlNlY3VyZS1haWEudmVyaXNpZ24uY29t +L0VWU2VjdXJlMjAwNi5jZXIwDQYJKoZIhvcNAQEFBQADggEBAD0wO+rooUrIM4qp +PHhp+hkXK6WMQ2qzGOmbMcZjw0govg5vkzkefPDryIXXbrF8mRagiJNMSfNaWWeh +Cj41OV24EdUl0OLbFxNzcvub599zRs/apfaRLTfsmlmOgi0/YP305i+3tJ2ll946 +P+qV1wXnXqTqEdIl4Ys3+1HmDCdTB1hoDwAAzqRVUXZ5+iiwPAU7R/LTHfMjV1ke +8jtNFfrorlZMCfVH/7eEnHJvVjOJt+YFe4aFMzE+DfuYIK7MH+olC2v79kBwbnEQ +fvHMA9gFeaQQ0GZEkxzRK+v/aNTuiYfr +oFXtrg0= +-----END CERTIFICATE----- diff --git a/src/utc/key-manager/data/invalid_p12_for_loadtest.p12 b/src/utc/key-manager/data/invalid_p12_for_loadtest.p12 new file mode 100755 index 000000000..94114da58 --- /dev/null +++ b/src/utc/key-manager/data/invalid_p12_for_loadtest.p12 @@ -0,0 +1,96 @@ +TUlJTmFRSUJBekNDRFM4R0NTcUdTSWIzRFFFSEFhQ0NEU0FFZ2cwY01JSU5HREND +Q2hjR0NTcUdTSWIzRFFFSApCcUNDQ2dnd2dnb0VBZ0VBTUlJSi9RWUpLb1pJaHZj +TkFRY0JNQndHQ2lxR1NJYjNEUUVNQVFZd0RnUUl2TzAxCkQyT0Rka1lDQWdnQWdJ +SUowTnNjdldxM2htWGFpNURRY2xlT2dFTFBidTJjOTdkK0tKblJHQ0s3SzNlUmIw +L3YKM0xGU0ZGVDlPQUswL09TMVpZQ2lPK0l1WjZScGM4QmFxZTg5eFZjT0hyUTBk +UTdzSXZicTEwZG5wNW5ZCmZFY3J0N3FQWGNSYTNJZE9YNFBGbzRhQ09GcTViSHY1 +TTNxdUhsZEtSaDRpdG9zanNBR3VGL3h0blZuTzZsVTUKVWxQaHRBZHIyTXByNFNI +aCtvQmJKa25MdnlkNm4vNHhaMmVsRUE4dWk0UXQ1R2ZpSHdXczJKN0tPM1o4TTF2 +Vwp5dWt1eVZUYVo2Uk5rajhka3EvUnR0dlZpbmxnQVRZTG9vc2pDc0g3VlZjZCsv +ejlKcUQzN1FRODlwemRqdkpnClErMjI0aWJOS3pMQXZwU1dPbzhCVUhLN1pEYzFv +YUxPRERaK1dBQTZqZmdIa3VoaFdZcjlkeGNlNlVkaE1naEoKTTdpeFd3YTM1MHBz +ZEFDUkVkR3hOUXp4bXVjbXVlcHJiRHVtVlBBbm5KZm5LZmdSWGRLcFRERldTNFRh +WVJjLwpLU0JacEZGZHV5L2dkcExHQ0hka2xUczMzYVdaL21FVlpKbmsyUGdnS3l2 +U0tIOW9MM0R4a1pJRmtHZFEKd2N5OGdBdUxCaXJkV0IvcTRKV3FXN3NIOGtNZkV3 +WEFDRW0xejRTekNpazhhZmFtUU5KRWJvdkEzUHZyaHcvUAoxSEU1S1BOdktNYUly +OWtrNXJUbkdHVFNOclNNcVVDbkJsNE1qVlM0SGFjclp2dnQ2MHkwRDNSRkI4SXFs +Rk10Cm9kMkZhZ3hvalB5Ty93UDhqREVSbnlTbzJJcnoweDBXVWpXQVJ0Y0xMSDJG +T0s3Uk9rWDEvV2pSWm1EVjBqdHYKeUw4cjk3WFpmL05kZFZVMTNKdDEzZEJKQ2p4 +WlJ2ZkpaZ05JOFJ5YmtQUTNZOUo1TElPTFZGUFUzWktJaTdXNwpLdEN3L0ZDVWZF +ZE5hckxRTVdHMFo5YnV4N3Z1L2VLMStLcEY5cGZ6RDNRMVYwc2oyTTE1OFE1VzJn +eTlxL3UwCmdPT3V5YmlaQjJBTDlreEJ2MHJxYjhoN1NGNVpJUm95ODVQcnd0blg3 +dzRYcSs0STdSQTY4YmNFR3lxZ1RXV2IKWFp4Y1k2NUYyc2xxZWtYZGRLZURTVGl6 +UWsvQVBnV3ZhL1R3Z2FVZVhSOVlCQ080bzcxcGxhLy9GTnFKNnBSbQp0WmpFWTlB +TEJDYzA4M2dzSW1jNytMQWV1YkVjWXpqaGhnUlBRd0dKZkpUTXFnQy9OT2E5d0Zo +dk5PNFFjRmpmClhReHhJRnhsUUo2NHFVMzE2RnlldXl4TFlHZDAydWFrckxMZ1l0 +QUdHN25QWkNZTmtVS3ZDd0lDS0pZSSt3QWcKQ1gwRlZ3WHNSMWYzM2tWdVY2c2Q0 +WUNvbno4MExrOWF5dk5KVmVDekVPQnZodGhiTWNQM21JbjIyWCtHVDNqVQpPNVow +YmtYQVUwQzhYVGZMUU1rMm02QWczbWN0cm40aUpCUHdRN2oxMkdubFNMa28rZTdJ +c3NSZDRRajR2QlpkCktYVUlvUmNPc1hxV29RZ1hKQXRkTEpFSFZvMFNVeXhWb2pY +c1hxVVozeVlPa1ZVeWt2WFpVY0JuUzZ4d3RhVXQKRXpkRnNFTzNOUVNMT2p1NVRw +cDEybEticmdJVG9WNzV6eUEzQ1VMRWRpbUVVV0Qvd0ErcERhSVMzOXNoTnllRQpl +ZHRBcDNXRjNtRGtIUUZ5S0c1MklWeDdoSlU4alhYdW52WTIxdHNoVEF4L0dkYTBY +MUN0Z1NVN1EwMFJPcitMClRhZWhSaUtzU2d4UWE2L2p5Slk1S1kxaElEendhZW01 +WTdnRG54b3RtUXVQaElYOE1lRDVRZHY2QVZvdmZTY04KMDdRdVd5VUJnRnNaemJw +NzlBc25QUkx6b2lBTVFsak1uN1RYRERMcSt1RjkyMk9VNDdCUWt6bFBmS0F1SGJ5 +dQpSK3Vad3REZk1ENzFGcVdqQ0FITVB5RU5pbnNuVWVoQ3dYMnBWeGE2S1NzNjFJ +c1RmYjNvVVBZMVRSeGZabmZkCjhTQVVmUGpLVnNzOUV5YWh1ditremVuUFVEWm41 +TFY5RTBHMERHTnhJZjQ5M0E1WjI5c2NOa1FjQ0JqVEpKdngKNEJCSkNFUzZTZ2tU +UWw3ZUZvQkdPSXFxeXRwWVA5UVpXNWp5N3JhbWd6L2dGMmtNS2pBZmlraGJkNXZC +NEZ3ZApRbEV4TWxiVyt3TC9mZnI0QUdsd2VubER6WEJGS1FNMG1ZWk5LTHVCOUxy +Unp3MzVmVkZaOVhZMDZWQ3hoYk1hCndJOWdONHJLQTNiTkczRENXVHNyMVRaNkN2 +cnFGSmpsZks0S0YvK2VOZm5rSVk4dVZZeG5QbFJSa21QdzRkcEUKS2RhWFVpdTVX +SnZadXBlWXFxTnNXZHhzK3YyS1MxRS9QY005QmdVRktGRDRsVzg0V2JXVUhQeHZ4 +WG9aaFNDcwpuUTBoc1BkNTNOS0JCZEVPYW81SEFBZitUNXlGbkp6WjNyVmtZQkVD +NjdnSHlXZ1hCMVp5MjgzeUFJaWh2VVh3CkRPRVZwcE5IbklxQWpRcG5jUWNEcFYw +L3pZQ3ZxT0VmVStKUHBtZXBnbzczN1RxMk1sVUtMVEJ5aGcxbVFoS20KMnBJNjNC +Rml3Mi8yaWdJbUZibWh6SmppbFdrYU00a3dNMXVHS09LZ2phY1hJL1ZTVkVhanVZ +QWZvMzdxdUJ4RgpaV3lXSm9GWEJ2UTdqb2xUS1hVVmJDcW5TU2FJdG9zWnJTM3Zj +RGRHVWVnUm0wcmY2SXpDUlBkU0lzZkNEZFpHCjlVZUNob3puTmV6b0xFTmdtcVFK +VFYzd0RvM3VTWmJ6dGxjdG9FUnZacG40NTdNTFpFbjhoWEV3TUxQWHgyVXIKSFE1 +ZllBZFRCekJwb0xpeTh1anpGeEZKRHpXOXl0bmI3YUZGN1lWaXZmajQyZVZHbkNB +TnZWY3drcDIvRTNNVwpJbWcwT3lxS1JRSGFHR0k3aUdOTzVLWXBUazBDZFN5RXJR +YXJINTJaUnZyMHQyQ0s2SjZ2RGdyaEpuemQ1QXlyCjZ0K2NvQVpCdzhlSUpxaU01 +V3pBbTRtbFpSU0hMK0pjYUtrcnFvWU9vK2tld2o3d2dXMktrLzdTOHJlMzhSdlAK +K1Y5bnFwZnIxOGdJVjcyRzJ5WjYwQzIxZVJxT0ZQZ2wxQ1libVdIcVlLWGF0dVQ0 +bytrZ0JtSnBlejV1dklIegpMU2Q4OEFuMDJvdytXUStLUDhZR1YzOFp0dUE2RDRG +UEEzZnNNZGhOT3FqdHdXaVBlaStJTGFYRDVQc09mREdICjJmWmdPV1hpdkZZcXE5 +Q20zQjNmZkZYL29ELzdzRk1zKy9BV2VaT2g4WHFVOHJvNzNMMUhOUlh4NEhkeVJV +WS8KcElud0EwbVdhRk5HZ0JSUGJOVzBBNmNaMmRZMEhuOHNSUnNGKzV0SXMwaE9l +bHBUMXkvWkVWeUdJbVRRZ0ViSwpLZWdnUUdUOWg5cmhyclVLK2hFMjdNb3JjUmk2 +dFZ0ZUtsTnlHUXNDSmtvMFpvcXFjdE00bzd3VDVjZTRuV3RiCml4enA1eERrRG1j +UDZlbGRIaVZtOFRzWm4waGttTkR1MHhwZ0lWdGI0VkRSbVdQNjg3RU9hR0hZaGpP +Qnc2WDEKR0QxZDF5eWcvVnhsVXIwbEttYnNGVkMybURpV2JuV2Q0OStGR3NyeVNj +MlJPOERsQzl4a1hMYUcrdWJqbUxwSwpsd2FnaUkyUDFNemtIdVppejdXbElqRmVm +dVloMHlyWXZEQTVVRGlRVERkb1pXRnVSNXI5M1FXZHNVY0hsdmRGCnJZbWhROTNG +Nkk0Z2FUOUhTVkVESmZpc0lqSVVtSXdoaDIwdGRHbmYzRkM1VnlxQllTNUdRT2Jx +M1ZuQzhzdFUKYjdieUNFTWxLcjViV3NsRWVtNmdSR1RCOXhla3RLZ3JzRmdTN25i +M0dlZWdxOUsrbVdJQkMvaUJPSW5WcUZZeApVdzgrczZ5d0FwWFBMUEVJclZadW1r +d283Umw4bEpmQ1RETm5pLzY4WEhoaFZIWTcwTjBQU2RmbkNBdlY5RzQxCjN3dVRa +SHFMT2VRRzNTbThJMUpKWGtXU3V1azBRSTdEVktacG16K3g0YUZCZCtybmNmdldP +RWJOOUcwWnFiVVQKbEdrZnh0VVdZNnBXWC9YSnB5QnpPbHYyK2ZDUGkvWWQwY3Ni +NDVJRXVGSE5HMXN2Z3FHTUp3NUJtRnU1djBRcwowaTF6S0JyTkEvQWNkNit1TDBV +cURaU3RCNmx5UG42K3VpZmgzc013Z2dMNUJna3Foa2lHOXcwQkJ3R2dnZ0xxCkJJ +SUM1akNDQXVJd2dnTGVCZ3NxaGtpRzl3MEJEQW9CQXFDQ0FxWXdnZ0tpTUJ3R0Np +cUdTSWIzRFFFTUFRTXcKRGdRSUJKdUJqMDd1SEdBQ0FnZ0FCSUlDZ0pCZk9sQzk5 +SkpqRVVCaWJZTFhJSlBlNTNDeTdlRFhDdFZhUGJoWApWSFBDc0JyVWQ3KzZVbDdW +aC9KSE1sSkwxVkEzV3ZHblg5M2YwcDVGSUNnWlpBM3NJWmpweEJvZVZrWjBaeDZy +ClpNbkJQSU40R2FIWXVmQ0dQeUFsUFhnRUdqbEJyM2c2U3hyOGo1MHZzV3Rmc3B3 +aUlMc3l0ZStuUTNrRTFuVjQKVGpOQm5heVhtQ01uRWtmNGtLdStkbExGYmQxT1kv +ZlFKYmlUK2Y5WXRNZmNmcDJJUis3YlhiMjNVSXY4V3QxSQpYeXFzWVRjVWpJdm5C +eUtTRHJ2VnU5NDF4MUVONURGMTk2NHFRYkFaYi96NXVlVGw4dENwYUNGbEdiWmNY +ejdYCjdMM2swWVdkeW14MUorc3pkNmhlUUpyenFNamNISzNYV0M3WWxEeXRXQjU5 +ajBlTk14NDJYRUZQMHBBTytndDkKSW55MlhMK3N4SkMveHpmNmFwWU1tbUd3RVhy +WmtrdWRzU1ZNZ0xDdFl5aW40ek03UEZ6TEFQSzlyeUVoc3hhUApnMDc3TUovYUlh +WjdQTGk3Y0FCei9nK2dRMWRTWGFrTk9vZjZFalJVQURIcGF2OVVLZUt3V2RSOHlj +Qi84QVFWClh4UVRwRXNGSjdpemROWkROQy9aZU9oYy9vaG5laTE2OXJmSDBzaFZl +ZWNramYrK2M4emxoL1k1VVdJaTNWNmkKNWM3UmxJSkxNdEhydnBCNVV4UnBaZ1dT +ZFh2Q3VUQ0JFemxaQWVXSjExSTREQWVpb3FKMVYzaDJLY1VqTktmMQp6OG1USnJ6 +QXljdWhtOG5wYUMwR2o2SlU3amlZUFpMdmorY0svZS9namFkV2dnSEZZc2pBS2hB +Q0RiQXRHNjROCkd1OVBXSnN6dmhTTzhnYTdUT1ZFemRiZTJqbTRvV3RxUGUzZ2I2 +ZVlsMk1hNkdUZmovUFVFRHBOQU9ucjk5cVYKZzN1S0lYTUJwMjExNWJmVWY1c2Jm +UGRNYm5IMTJYSUxYUjlWYStKamVRSGV4YTY0UVdsc2lSZ3RYRUFYeG9FYgpEMmFU +bGZkc0pwZ2lseWozMVk0NXhPZE43RkkrTHRmaHVkeHQxa0FCUGRtS3dSTXhKVEFq +QmdrcWhraUc5dzBCCkNSVXhGZ1FVTXZ4WXVQaTNYcEVlWGJ6QWtYYU5iQXc3UDVn +d01UQWhNQWtHQlNzT0F3SWFCUUFFRk9CQzRwcEUKQVhPK3hkelNCS2ltdmpCQlRM +YkVCQWpsYVdpQzVJVnRtQUlDQ0FBPQo= diff --git a/src/utc/key-manager/data/p12_for_loadtest.p12 b/src/utc/key-manager/data/p12_for_loadtest.p12 new file mode 100755 index 000000000..f9133a1c4 Binary files /dev/null and b/src/utc/key-manager/data/p12_for_loadtest.p12 differ diff --git a/src/utc/key-manager/data/pkcs.p12 b/src/utc/key-manager/data/pkcs.p12 new file mode 100755 index 000000000..4548d51ff Binary files /dev/null and b/src/utc/key-manager/data/pkcs.p12 differ diff --git a/src/utc/key-manager/res-util.c b/src/utc/key-manager/res-util.c new file mode 100755 index 000000000..2ec37e51c --- /dev/null +++ b/src/utc/key-manager/res-util.c @@ -0,0 +1,43 @@ +// +// Copyright (c) 2017 Samsung Electronics Co., Ltd. +// +// Licensed under the Apache License, Version 2.0 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// + +#include "res-util.h" + +#include "tct_common.h" +#include +#include + +void append_to_app_data_path(const char *filename, char *outbuf, size_t size) +{ + if (!filename || !outbuf || size == 0) + return; + + char *app_data_path = app_get_data_path(); + if (!app_data_path) + return; + + size_t app_data_path_len = strlen(app_data_path); + if (size < app_data_path_len + strlen(filename) + 1) + goto out; + + memset(outbuf, 0x00, size); + memcpy(outbuf, app_data_path, app_data_path_len); + memcpy(outbuf + app_data_path_len, filename, strlen(filename)); + +out: + free(app_data_path); + return; +} diff --git a/src/utc/key-manager/res-util.h b/src/utc/key-manager/res-util.h new file mode 100755 index 000000000..ce0a7e574 --- /dev/null +++ b/src/utc/key-manager/res-util.h @@ -0,0 +1,25 @@ +// +// Copyright (c) 2017 Samsung Electronics Co., Ltd. +// +// Licensed under the Apache License, Version 2.0 (the License); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +#ifndef _UTC_KEY_MANAGER_RES_UTIL_H__ +#define _UTC_KEY_MANAGER_RES_UTIL_H__ + +#define PATH_LEN 1024 + +#include + +void append_to_app_data_path(const char *filename, char *outbuf, size_t size); + +#endif diff --git a/src/utc/key-manager/res/cert_for_loadtest.pem b/src/utc/key-manager/res/cert_for_loadtest.pem deleted file mode 100755 index 3925deb8d..000000000 --- a/src/utc/key-manager/res/cert_for_loadtest.pem +++ /dev/null @@ -1,34 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF0TCCBLmgAwIBAgIQaPGTP4aS7Ut/WDNaBzdQrDANBgkqhkiG9w0BAQUFADCB -ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug -YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr -VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x -NDAyMjAwMDAwMDBaFw0xNTAyMjAyMzU5NTlaMIHmMRMwEQYLKwYBBAGCNzwCAQMT -AlBMMR0wGwYDVQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGA1UEBRMKMDAw -MDAyNTIzNzELMAkGA1UEBhMCUEwxDzANBgNVBBEUBjAwLTk1MDEUMBIGA1UECBML -bWF6b3dpZWNraWUxETAPBgNVBAcUCFdhcnN6YXdhMRYwFAYDVQQJFA1TZW5hdG9y -c2thIDE4MRMwEQYDVQQKFAptQmFuayBTLkEuMQwwCgYDVQQLFANESU4xGTAXBgNV -BAMUEHd3dy5tYmFuay5jb20ucGwwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQDph6x8V6xUW/+651+qHF+UmorH9uaz2ZrX2bIWiMKIJFmpDDHlxcapKkqE -BV04is83aiCpqKtc2ZHy2g4Hpj1eSF5BP2+OAlo0YUQZPIeRRdiMjmeAxw/ncBDx -9rQBuCJ4XTD6cqQox5SI0TASOZ+wyAEjbDRXzL73XqRAFZ1LOpb2ONkolS+RutMB -vshvCsWPeNe7eGLuOh6DyC6r1vX9xhw3xnjM2mTSvmtimgzSLacNGKqRrsucUgcb -0+O5C2jZAtAMLyZksL92cxmWbtVzUYzem4chjHu5cRxUlPNzUJWrrczueB7Ip4A8 -aQuFMfNXYc0x+WLWjy//urypMKjhAgMBAAGjggGjMIIBnzAbBgNVHREEFDASghB3 -d3cubWJhbmsuY29tLnBsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud -JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBEBgNVHSAEPTA7MDkGC2CGSAGG+EUB -BxcGMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMw -HQYDVR0OBBYEFN37iGaS7mZnENxZ9FGqNLR+QgoMMB8GA1UdIwQYMBaAFPyKULqe -uSVae1WFT5UAY4/pWGtDMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3Vy -ZS1jcmwudmVyaXNpZ24uY29tL0VWU2VjdXJlMjAwNi5jcmwwfAYIKwYBBQUHAQEE -cDBuMC0GCCsGAQUFBzABhiFodHRwOi8vRVZTZWN1cmUtb2NzcC52ZXJpc2lnbi5j -b20wPQYIKwYBBQUHMAKGMWh0dHA6Ly9FVlNlY3VyZS1haWEudmVyaXNpZ24uY29t -L0VWU2VjdXJlMjAwNi5jZXIwDQYJKoZIhvcNAQEFBQADggEBAD0wO+rooUrIM4qp -PHhp+hkXK6WMQ2qzGOmbMcZjw0govg5vkzkefPDryIXXbrF8mRagiJNMSfNaWWeh -Cj41OV24EdUl0OLbFxNzcvub599zRs/apfaRLTfsmlmOgi0/YP305i+3tJ2ll946 -P+qV1wXnXqTqEdIl4Ys3+1HmDCdTB1hoDwAAzqRVUXZ5+iiwPAU7R/LTHfMjV1ke -8jtNFfrorlZMCfVH/7eEnHJvVjOJt+YFe4aFMzE+DfuYIK7MH+olC2v79kBwbnEQ -fvHMA9gFwOYLUBBdSfcocp8EKZ+mRlNPGR/3LBrPeaQQ0GZEkxzRK+v/aNTuiYfr -oFXtrg0= ------END CERTIFICATE----- diff --git a/src/utc/key-manager/res/dfb08fe4.0 b/src/utc/key-manager/res/dfb08fe4.0 deleted file mode 100755 index c349ba3b2..000000000 --- a/src/utc/key-manager/res/dfb08fe4.0 +++ /dev/null @@ -1,22 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDnzCCAoegAwIBAgIJAMH/ADkC5YSTMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNV -BAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ0wCwYDVQQKDARBQ01FMRAwDgYD -VQQLDAdUZXN0aW5nMSEwHwYDVQQDDBhUZXN0IHJvb3QgY2EgY2VydGlmaWNhdGUw -HhcNMTQxMjMwMTcyMTUyWhcNMjQxMjI3MTcyMTUyWjBmMQswCQYDVQQGEwJBVTET -MBEGA1UECAwKU29tZS1TdGF0ZTENMAsGA1UECgwEQUNNRTEQMA4GA1UECwwHVGVz -dGluZzEhMB8GA1UEAwwYVGVzdCByb290IGNhIGNlcnRpZmljYXRlMIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0EJRdUtd2th0vTVF7QxvDKzyFCF3w9vC -9IDE/Yr12w+a9jd0s7/eG96qTHIYffS3B7x2MB+d4n+SR3W0qmYh7xk8qfEgH3da -eDoV59IZ9r543KM+g8jm6KffYGX1bIJVVY5OhBRbO9nY6byYpd5kbCIUB6dCf7/W -rQl1aIdLGFIegAzPGFPXDcU6F192686x54bxt/itMX4agHJ9ZC/rrTBIZghVsjJo -5/AH5WZpasv8sfrGiiohAxtieoYoJkv5MOYP4/2lPlOY+Cgw1Yoz+HHv31AllgFs -BquBb/kJVmCCNsAOcnvQzTZUsW/TXz9G2nwRdqI1nSy2JvVjZGsqGQIDAQABo1Aw -TjAdBgNVHQ4EFgQUt6pkzFt1PZlfYRL/HGnufF4frdwwHwYDVR0jBBgwFoAUt6pk -zFt1PZlfYRL/HGnufF4frdwwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOC -AQEAld7Qwq0cdzDQ51w1RVLwTR8Oy25PB3rzwEHcSGJmdqlMi3xOdaz80S1R1BBX -ldvGBG5Tn0vT7xSuhmSgI2/HnBpy9ocHVOmhtNB4473NieEpfTYrnGXrFxu46Wus -9m/ZnugcQ2G6C54A/NFtvgLmaC8uH8M7gKdS6uYUwJFQEofkjmd4UpOYSqmcRXhS -Jzd5FYFWkJhKJYp3nlENSOD8CUFFVGekm05nFN2gRVc/qaqQkEX77+XYvhodLRsV -qMn7nf7taidDKLO2T4bhujztnTYOhhaXKgPy7AtZ28N2wvX96VyAPB/vrchGmyBK -kOg11TpPdNDkhb1J4ZCh2gupDg== ------END CERTIFICATE----- diff --git a/src/utc/key-manager/res/invalid_cert_for_loadtest.pem b/src/utc/key-manager/res/invalid_cert_for_loadtest.pem deleted file mode 100755 index 0f8164506..000000000 --- a/src/utc/key-manager/res/invalid_cert_for_loadtest.pem +++ /dev/null @@ -1,28 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIF0TCCBLmgAwIBAgIQaPGTP4aS7Ut/WDNaBzdQrDANBgkqhkiG9w0BAQUFADCB -ujELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL -ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug -YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMr -VmVyaVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTAeFw0x -NDAyMjAwMDAwMDBaFw0xNTAyMjAyMzU5NTlaMIHmMRMwEQYLKwYBBAGCNzwCAQMT -AlBMMR0wGwYDVQQPExRQcml2YXRlIE9yZ2FuaXphdGlvbjETMBEGA1UEBRMKMDAw -MDAyNTIzNzELMAkGA1UEBhMCUEwxDzANBgNVBBEUBjAwLTk1MDEUMBIGA1UECBML -bWF6b3dpZWNraWUxETAPBgNVBAcw3xnjM2mTSvmtimgzSLacNGKqRrsucUgcb -0+O5C2jZAtAMLyZksL92cxmWbtVzUYzem4chjHu5cRxUlPNzUJWrrczueB7Ip4A8 -aQuFMfNXYc0x+WLWjy//urypMKjhAgMBAAGjggGjMIIBnzAbBgNVHREEFDASghB3 -d3cubWJhbmsuY29tLnBsMAkGA1UdEwQCMAAwDgYDVR0PAQH/BAQDAgWgMB0GA1Ud -JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBEBgNVHSAEPTA7MDkGC2CGSAGG+EUB -BxcGMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9jcHMw -HQYDVR0OBBYEFN37iGaS7mZnENxZ9FGqNLR+QgoMMB8GA1UdIwQYMBaAFPyKULqe -uSVae1WFT5UAY4/pWGtDMEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6Ly9FVlNlY3Vy -ZS1jcmwudmVyaXNpZ24uY29tL0VWU2VjdXJlMjAwNi5jcmwwfAYIKwYBBQUHAQEE -cDBuMC0GCCsG -b20wPQYIKwYBBQUHMAKGMWh0dHA6Ly9FVlNlY3VyZS1haWEudmVyaXNpZ24uY29t -L0VWU2VjdXJlMjAwNi5jZXIwDQYJKoZIhvcNAQEFBQADggEBAD0wO+rooUrIM4qp -PHhp+hkXK6WMQ2qzGOmbMcZjw0govg5vkzkefPDryIXXbrF8mRagiJNMSfNaWWeh -Cj41OV24EdUl0OLbFxNzcvub599zRs/apfaRLTfsmlmOgi0/YP305i+3tJ2ll946 -P+qV1wXnXqTqEdIl4Ys3+1HmDCdTB1hoDwAAzqRVUXZ5+iiwPAU7R/LTHfMjV1ke -8jtNFfrorlZMCfVH/7eEnHJvVjOJt+YFe4aFMzE+DfuYIK7MH+olC2v79kBwbnEQ -fvHMA9gFeaQQ0GZEkxzRK+v/aNTuiYfr -oFXtrg0= ------END CERTIFICATE----- diff --git a/src/utc/key-manager/res/invalid_p12_for_loadtest.p12 b/src/utc/key-manager/res/invalid_p12_for_loadtest.p12 deleted file mode 100755 index 94114da58..000000000 --- a/src/utc/key-manager/res/invalid_p12_for_loadtest.p12 +++ /dev/null @@ -1,96 +0,0 @@ -TUlJTmFRSUJBekNDRFM4R0NTcUdTSWIzRFFFSEFhQ0NEU0FFZ2cwY01JSU5HREND -Q2hjR0NTcUdTSWIzRFFFSApCcUNDQ2dnd2dnb0VBZ0VBTUlJSi9RWUpLb1pJaHZj -TkFRY0JNQndHQ2lxR1NJYjNEUUVNQVFZd0RnUUl2TzAxCkQyT0Rka1lDQWdnQWdJ -SUowTnNjdldxM2htWGFpNURRY2xlT2dFTFBidTJjOTdkK0tKblJHQ0s3SzNlUmIw -L3YKM0xGU0ZGVDlPQUswL09TMVpZQ2lPK0l1WjZScGM4QmFxZTg5eFZjT0hyUTBk -UTdzSXZicTEwZG5wNW5ZCmZFY3J0N3FQWGNSYTNJZE9YNFBGbzRhQ09GcTViSHY1 -TTNxdUhsZEtSaDRpdG9zanNBR3VGL3h0blZuTzZsVTUKVWxQaHRBZHIyTXByNFNI -aCtvQmJKa25MdnlkNm4vNHhaMmVsRUE4dWk0UXQ1R2ZpSHdXczJKN0tPM1o4TTF2 -Vwp5dWt1eVZUYVo2Uk5rajhka3EvUnR0dlZpbmxnQVRZTG9vc2pDc0g3VlZjZCsv -ejlKcUQzN1FRODlwemRqdkpnClErMjI0aWJOS3pMQXZwU1dPbzhCVUhLN1pEYzFv -YUxPRERaK1dBQTZqZmdIa3VoaFdZcjlkeGNlNlVkaE1naEoKTTdpeFd3YTM1MHBz -ZEFDUkVkR3hOUXp4bXVjbXVlcHJiRHVtVlBBbm5KZm5LZmdSWGRLcFRERldTNFRh -WVJjLwpLU0JacEZGZHV5L2dkcExHQ0hka2xUczMzYVdaL21FVlpKbmsyUGdnS3l2 -U0tIOW9MM0R4a1pJRmtHZFEKd2N5OGdBdUxCaXJkV0IvcTRKV3FXN3NIOGtNZkV3 -WEFDRW0xejRTekNpazhhZmFtUU5KRWJvdkEzUHZyaHcvUAoxSEU1S1BOdktNYUly -OWtrNXJUbkdHVFNOclNNcVVDbkJsNE1qVlM0SGFjclp2dnQ2MHkwRDNSRkI4SXFs -Rk10Cm9kMkZhZ3hvalB5Ty93UDhqREVSbnlTbzJJcnoweDBXVWpXQVJ0Y0xMSDJG -T0s3Uk9rWDEvV2pSWm1EVjBqdHYKeUw4cjk3WFpmL05kZFZVMTNKdDEzZEJKQ2p4 -WlJ2ZkpaZ05JOFJ5YmtQUTNZOUo1TElPTFZGUFUzWktJaTdXNwpLdEN3L0ZDVWZF -ZE5hckxRTVdHMFo5YnV4N3Z1L2VLMStLcEY5cGZ6RDNRMVYwc2oyTTE1OFE1VzJn -eTlxL3UwCmdPT3V5YmlaQjJBTDlreEJ2MHJxYjhoN1NGNVpJUm95ODVQcnd0blg3 -dzRYcSs0STdSQTY4YmNFR3lxZ1RXV2IKWFp4Y1k2NUYyc2xxZWtYZGRLZURTVGl6 -UWsvQVBnV3ZhL1R3Z2FVZVhSOVlCQ080bzcxcGxhLy9GTnFKNnBSbQp0WmpFWTlB -TEJDYzA4M2dzSW1jNytMQWV1YkVjWXpqaGhnUlBRd0dKZkpUTXFnQy9OT2E5d0Zo -dk5PNFFjRmpmClhReHhJRnhsUUo2NHFVMzE2RnlldXl4TFlHZDAydWFrckxMZ1l0 -QUdHN25QWkNZTmtVS3ZDd0lDS0pZSSt3QWcKQ1gwRlZ3WHNSMWYzM2tWdVY2c2Q0 -WUNvbno4MExrOWF5dk5KVmVDekVPQnZodGhiTWNQM21JbjIyWCtHVDNqVQpPNVow -YmtYQVUwQzhYVGZMUU1rMm02QWczbWN0cm40aUpCUHdRN2oxMkdubFNMa28rZTdJ -c3NSZDRRajR2QlpkCktYVUlvUmNPc1hxV29RZ1hKQXRkTEpFSFZvMFNVeXhWb2pY -c1hxVVozeVlPa1ZVeWt2WFpVY0JuUzZ4d3RhVXQKRXpkRnNFTzNOUVNMT2p1NVRw -cDEybEticmdJVG9WNzV6eUEzQ1VMRWRpbUVVV0Qvd0ErcERhSVMzOXNoTnllRQpl -ZHRBcDNXRjNtRGtIUUZ5S0c1MklWeDdoSlU4alhYdW52WTIxdHNoVEF4L0dkYTBY -MUN0Z1NVN1EwMFJPcitMClRhZWhSaUtzU2d4UWE2L2p5Slk1S1kxaElEendhZW01 -WTdnRG54b3RtUXVQaElYOE1lRDVRZHY2QVZvdmZTY04KMDdRdVd5VUJnRnNaemJw -NzlBc25QUkx6b2lBTVFsak1uN1RYRERMcSt1RjkyMk9VNDdCUWt6bFBmS0F1SGJ5 -dQpSK3Vad3REZk1ENzFGcVdqQ0FITVB5RU5pbnNuVWVoQ3dYMnBWeGE2S1NzNjFJ -c1RmYjNvVVBZMVRSeGZabmZkCjhTQVVmUGpLVnNzOUV5YWh1ditremVuUFVEWm41 -TFY5RTBHMERHTnhJZjQ5M0E1WjI5c2NOa1FjQ0JqVEpKdngKNEJCSkNFUzZTZ2tU -UWw3ZUZvQkdPSXFxeXRwWVA5UVpXNWp5N3JhbWd6L2dGMmtNS2pBZmlraGJkNXZC -NEZ3ZApRbEV4TWxiVyt3TC9mZnI0QUdsd2VubER6WEJGS1FNMG1ZWk5LTHVCOUxy -Unp3MzVmVkZaOVhZMDZWQ3hoYk1hCndJOWdONHJLQTNiTkczRENXVHNyMVRaNkN2 -cnFGSmpsZks0S0YvK2VOZm5rSVk4dVZZeG5QbFJSa21QdzRkcEUKS2RhWFVpdTVX -SnZadXBlWXFxTnNXZHhzK3YyS1MxRS9QY005QmdVRktGRDRsVzg0V2JXVUhQeHZ4 -WG9aaFNDcwpuUTBoc1BkNTNOS0JCZEVPYW81SEFBZitUNXlGbkp6WjNyVmtZQkVD -NjdnSHlXZ1hCMVp5MjgzeUFJaWh2VVh3CkRPRVZwcE5IbklxQWpRcG5jUWNEcFYw -L3pZQ3ZxT0VmVStKUHBtZXBnbzczN1RxMk1sVUtMVEJ5aGcxbVFoS20KMnBJNjNC -Rml3Mi8yaWdJbUZibWh6SmppbFdrYU00a3dNMXVHS09LZ2phY1hJL1ZTVkVhanVZ -QWZvMzdxdUJ4RgpaV3lXSm9GWEJ2UTdqb2xUS1hVVmJDcW5TU2FJdG9zWnJTM3Zj -RGRHVWVnUm0wcmY2SXpDUlBkU0lzZkNEZFpHCjlVZUNob3puTmV6b0xFTmdtcVFK -VFYzd0RvM3VTWmJ6dGxjdG9FUnZacG40NTdNTFpFbjhoWEV3TUxQWHgyVXIKSFE1 -ZllBZFRCekJwb0xpeTh1anpGeEZKRHpXOXl0bmI3YUZGN1lWaXZmajQyZVZHbkNB -TnZWY3drcDIvRTNNVwpJbWcwT3lxS1JRSGFHR0k3aUdOTzVLWXBUazBDZFN5RXJR -YXJINTJaUnZyMHQyQ0s2SjZ2RGdyaEpuemQ1QXlyCjZ0K2NvQVpCdzhlSUpxaU01 -V3pBbTRtbFpSU0hMK0pjYUtrcnFvWU9vK2tld2o3d2dXMktrLzdTOHJlMzhSdlAK -K1Y5bnFwZnIxOGdJVjcyRzJ5WjYwQzIxZVJxT0ZQZ2wxQ1libVdIcVlLWGF0dVQ0 -bytrZ0JtSnBlejV1dklIegpMU2Q4OEFuMDJvdytXUStLUDhZR1YzOFp0dUE2RDRG -UEEzZnNNZGhOT3FqdHdXaVBlaStJTGFYRDVQc09mREdICjJmWmdPV1hpdkZZcXE5 -Q20zQjNmZkZYL29ELzdzRk1zKy9BV2VaT2g4WHFVOHJvNzNMMUhOUlh4NEhkeVJV -WS8KcElud0EwbVdhRk5HZ0JSUGJOVzBBNmNaMmRZMEhuOHNSUnNGKzV0SXMwaE9l -bHBUMXkvWkVWeUdJbVRRZ0ViSwpLZWdnUUdUOWg5cmhyclVLK2hFMjdNb3JjUmk2 -dFZ0ZUtsTnlHUXNDSmtvMFpvcXFjdE00bzd3VDVjZTRuV3RiCml4enA1eERrRG1j -UDZlbGRIaVZtOFRzWm4waGttTkR1MHhwZ0lWdGI0VkRSbVdQNjg3RU9hR0hZaGpP -Qnc2WDEKR0QxZDF5eWcvVnhsVXIwbEttYnNGVkMybURpV2JuV2Q0OStGR3NyeVNj -MlJPOERsQzl4a1hMYUcrdWJqbUxwSwpsd2FnaUkyUDFNemtIdVppejdXbElqRmVm -dVloMHlyWXZEQTVVRGlRVERkb1pXRnVSNXI5M1FXZHNVY0hsdmRGCnJZbWhROTNG -Nkk0Z2FUOUhTVkVESmZpc0lqSVVtSXdoaDIwdGRHbmYzRkM1VnlxQllTNUdRT2Jx -M1ZuQzhzdFUKYjdieUNFTWxLcjViV3NsRWVtNmdSR1RCOXhla3RLZ3JzRmdTN25i -M0dlZWdxOUsrbVdJQkMvaUJPSW5WcUZZeApVdzgrczZ5d0FwWFBMUEVJclZadW1r -d283Umw4bEpmQ1RETm5pLzY4WEhoaFZIWTcwTjBQU2RmbkNBdlY5RzQxCjN3dVRa -SHFMT2VRRzNTbThJMUpKWGtXU3V1azBRSTdEVktacG16K3g0YUZCZCtybmNmdldP -RWJOOUcwWnFiVVQKbEdrZnh0VVdZNnBXWC9YSnB5QnpPbHYyK2ZDUGkvWWQwY3Ni -NDVJRXVGSE5HMXN2Z3FHTUp3NUJtRnU1djBRcwowaTF6S0JyTkEvQWNkNit1TDBV -cURaU3RCNmx5UG42K3VpZmgzc013Z2dMNUJna3Foa2lHOXcwQkJ3R2dnZ0xxCkJJ -SUM1akNDQXVJd2dnTGVCZ3NxaGtpRzl3MEJEQW9CQXFDQ0FxWXdnZ0tpTUJ3R0Np -cUdTSWIzRFFFTUFRTXcKRGdRSUJKdUJqMDd1SEdBQ0FnZ0FCSUlDZ0pCZk9sQzk5 -SkpqRVVCaWJZTFhJSlBlNTNDeTdlRFhDdFZhUGJoWApWSFBDc0JyVWQ3KzZVbDdW -aC9KSE1sSkwxVkEzV3ZHblg5M2YwcDVGSUNnWlpBM3NJWmpweEJvZVZrWjBaeDZy -ClpNbkJQSU40R2FIWXVmQ0dQeUFsUFhnRUdqbEJyM2c2U3hyOGo1MHZzV3Rmc3B3 -aUlMc3l0ZStuUTNrRTFuVjQKVGpOQm5heVhtQ01uRWtmNGtLdStkbExGYmQxT1kv -ZlFKYmlUK2Y5WXRNZmNmcDJJUis3YlhiMjNVSXY4V3QxSQpYeXFzWVRjVWpJdm5C -eUtTRHJ2VnU5NDF4MUVONURGMTk2NHFRYkFaYi96NXVlVGw4dENwYUNGbEdiWmNY -ejdYCjdMM2swWVdkeW14MUorc3pkNmhlUUpyenFNamNISzNYV0M3WWxEeXRXQjU5 -ajBlTk14NDJYRUZQMHBBTytndDkKSW55MlhMK3N4SkMveHpmNmFwWU1tbUd3RVhy -WmtrdWRzU1ZNZ0xDdFl5aW40ek03UEZ6TEFQSzlyeUVoc3hhUApnMDc3TUovYUlh -WjdQTGk3Y0FCei9nK2dRMWRTWGFrTk9vZjZFalJVQURIcGF2OVVLZUt3V2RSOHlj -Qi84QVFWClh4UVRwRXNGSjdpemROWkROQy9aZU9oYy9vaG5laTE2OXJmSDBzaFZl -ZWNramYrK2M4emxoL1k1VVdJaTNWNmkKNWM3UmxJSkxNdEhydnBCNVV4UnBaZ1dT -ZFh2Q3VUQ0JFemxaQWVXSjExSTREQWVpb3FKMVYzaDJLY1VqTktmMQp6OG1USnJ6 -QXljdWhtOG5wYUMwR2o2SlU3amlZUFpMdmorY0svZS9namFkV2dnSEZZc2pBS2hB -Q0RiQXRHNjROCkd1OVBXSnN6dmhTTzhnYTdUT1ZFemRiZTJqbTRvV3RxUGUzZ2I2 -ZVlsMk1hNkdUZmovUFVFRHBOQU9ucjk5cVYKZzN1S0lYTUJwMjExNWJmVWY1c2Jm -UGRNYm5IMTJYSUxYUjlWYStKamVRSGV4YTY0UVdsc2lSZ3RYRUFYeG9FYgpEMmFU -bGZkc0pwZ2lseWozMVk0NXhPZE43RkkrTHRmaHVkeHQxa0FCUGRtS3dSTXhKVEFq -QmdrcWhraUc5dzBCCkNSVXhGZ1FVTXZ4WXVQaTNYcEVlWGJ6QWtYYU5iQXc3UDVn -d01UQWhNQWtHQlNzT0F3SWFCUUFFRk9CQzRwcEUKQVhPK3hkelNCS2ltdmpCQlRM -YkVCQWpsYVdpQzVJVnRtQUlDQ0FBPQo= diff --git a/src/utc/key-manager/res/p12_for_loadtest.p12 b/src/utc/key-manager/res/p12_for_loadtest.p12 deleted file mode 100755 index f9133a1c4..000000000 Binary files a/src/utc/key-manager/res/p12_for_loadtest.p12 and /dev/null differ diff --git a/src/utc/key-manager/res/pkcs.p12 b/src/utc/key-manager/res/pkcs.p12 deleted file mode 100755 index 4548d51ff..000000000 Binary files a/src/utc/key-manager/res/pkcs.p12 and /dev/null differ diff --git a/src/utc/key-manager/utc-key-manager-storage.c b/src/utc/key-manager/utc-key-manager-storage.c index c2278e749..f7a2fc67d 100755 --- a/src/utc/key-manager/utc-key-manager-storage.c +++ b/src/utc/key-manager/utc-key-manager-storage.c @@ -14,6 +14,7 @@ // limitations under the License. // #include "assert.h" +#include "res-util.h" #include #include @@ -1076,7 +1077,9 @@ int utc_ckmc_save_pkcs12_p(void) cert_policy.password = NULL; cert_policy.extractable = true; - temp = ckmc_pkcs12_load("/usr/share/utc_key-manager/pkcs.p12", NULL, &ppkcs12); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("pkcs.p12", p12_path, sizeof(p12_path)); + temp = ckmc_pkcs12_load(p12_path, NULL, &ppkcs12); assert_eq(temp, CKMC_ERROR_NONE); temp = ckmc_save_pkcs12( @@ -1114,7 +1117,9 @@ int utc_ckmc_save_pkcs12_n(void) cert_policy.password = NULL; cert_policy.extractable = true; - temp = ckmc_pkcs12_load("/usr/share/utc_key-manager/pkcs.p12", NULL, &ppkcs12); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("pkcs.p12", p12_path, sizeof(p12_path)); + temp = ckmc_pkcs12_load(p12_path, NULL, &ppkcs12); assert_eq(temp, CKMC_ERROR_NONE); temp = ckmc_save_pkcs12( @@ -1150,7 +1155,9 @@ int utc_ckmc_get_pkcs12_p(void) cert_policy.password = NULL; cert_policy.extractable = true; - temp = ckmc_pkcs12_load("/usr/share/utc_key-manager/pkcs.p12", NULL, &ppkcs12); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("pkcs.p12", p12_path, sizeof(p12_path)); + temp = ckmc_pkcs12_load(p12_path, NULL, &ppkcs12); assert_eq(temp, CKMC_ERROR_NONE); temp = ckmc_save_pkcs12( diff --git a/src/utc/key-manager/utc-key-manager-type.c b/src/utc/key-manager/utc-key-manager-type.c index da217c653..a38c2d16b 100755 --- a/src/utc/key-manager/utc-key-manager-type.c +++ b/src/utc/key-manager/utc-key-manager-type.c @@ -15,6 +15,7 @@ // #include "assert.h" #include "tct_common.h" +#include "res-util.h" #include #include @@ -1300,7 +1301,10 @@ int utc_ckmc_load_cert_from_file_p(void) ckmc_cert_s *pcert; - ret = ckmc_load_cert_from_file("/usr/share/utc_key-manager/cert_for_loadtest.pem", &pcert); + char cert_path[PATH_LEN] = {0, }; + append_to_app_data_path("cert_for_loadtest.pem", cert_path, sizeof(cert_path)); + + ret = ckmc_load_cert_from_file(cert_path, &pcert); assert_eq(ret,CKMC_ERROR_NONE); ckmc_cert_free(pcert); @@ -1320,7 +1324,11 @@ int utc_ckmc_load_cert_from_file_n(void) ckmc_cert_s *pcert; - ret = ckmc_load_cert_from_file("/usr/share/utc_key-manager/invalid_cert_for_loadtest.pem", &pcert); + char cert_path[PATH_LEN] = {0, }; + append_to_app_data_path( + "invalid_cert_for_loadtest.pem", cert_path, sizeof(cert_path)); + + ret = ckmc_load_cert_from_file(cert_path, &pcert); assert_eq(ret,CKMC_ERROR_INVALID_FORMAT); remove(path2); @@ -1345,8 +1353,10 @@ int utc_ckmc_load_from_pkcs12_file_p(void) ckmc_cert_s *cert = NULL; ckmc_cert_list_s *ca_cert_list = NULL; - temp = ckmc_load_from_pkcs12_file("/usr/share/utc_key-manager/p12_for_loadtest.p12", - password, &private_key, &cert, &ca_cert_list); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("p12_for_loadtest.p12", p12_path, sizeof(p12_path)); + temp = ckmc_load_from_pkcs12_file( + p12_path, password, &private_key, &cert, &ca_cert_list); assert_eq(temp,CKMC_ERROR_NONE); assert_neq(private_key, NULL); @@ -1406,8 +1416,10 @@ int utc_ckmc_load_from_pkcs12_file_n(void) ckmc_cert_s *cert = NULL; ckmc_cert_list_s *ca_cert_list = NULL; - temp = ckmc_load_from_pkcs12_file("/usr/share/utc_key-manager/invalid_p12_for_loadtest.p12", - password, &private_key, &cert, &ca_cert_list); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("invalid_p12_for_loadtest.p12", p12_path, sizeof(p12_path)); + temp = ckmc_load_from_pkcs12_file( + p12_path, password, &private_key, &cert, &ca_cert_list); assert_eq(temp,CKMC_ERROR_INVALID_FORMAT); return 0; @@ -1427,7 +1439,9 @@ int utc_ckmc_pkcs12_load_p(void) ckmc_pkcs12_s *ppkcs12 = NULL; - temp = ckmc_pkcs12_load("/usr/share/utc_key-manager/p12_for_loadtest.p12", password, &ppkcs12); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path("p12_for_loadtest.p12", p12_path, sizeof(p12_path)); + temp = ckmc_pkcs12_load(p12_path, password, &ppkcs12); assert_eq(temp,CKMC_ERROR_NONE); ckmc_pkcs12_free(ppkcs12); @@ -1449,7 +1463,10 @@ int utc_ckmc_pkcs12_load_n(void) ckmc_pkcs12_s *ppkcs12 = NULL; - temp = ckmc_pkcs12_load("/usr/share/utc_key-manager/invalid_p12_for_loadtest.p12", password, &ppkcs12); + char p12_path[PATH_LEN] = {0, }; + append_to_app_data_path( + "invalid_p12_for_loadtest.p12", p12_path, sizeof(p12_path)); + temp = ckmc_pkcs12_load(p12_path, password, &ppkcs12); assert_eq(temp,CKMC_ERROR_INVALID_FORMAT); return 0;