diff options
| author | Dongsun Lee <ds73.lee@samsung.com> | 2016-04-14 11:59:09 +0900 |
|---|---|---|
| committer | Dongsun Lee <ds73.lee@samsung.com> | 2016-04-15 14:09:03 +0900 |
| commit | f6a6881df93b6b76a06b2c31edf3dbddafd9b485 (patch) | |
| tree | 89047b34b1c985960d9b10e3c7e85352bd5700ff | |
| parent | db7f02f12c9251b12e1fc733ce9389ba9c425908 (diff) | |
| download | cert-svc-f6a6881df93b6b76a06b2c31edf3dbddafd9b485.tar.gz cert-svc-f6a6881df93b6b76a06b2c31edf3dbddafd9b485.tar.bz2 cert-svc-f6a6881df93b6b76a06b2c31edf3dbddafd9b485.zip | |
change a user from system to security_fwsubmit/accepted/tizen_common/20160418.074221
Change-Id: I00d1a98299e3febe0d0d552e2659c16964906d3e
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>
| -rw-r--r-- | packaging/cert-svc.spec | 5 | ||||
| -rw-r--r-- | systemd/cert-server.service.in | 4 | ||||
| -rw-r--r-- | systemd/cert-server.socket | 4 | ||||
| -rw-r--r-- | tests/pkcs12/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/pkcs12/new_test_cases.cpp | 7 |
5 files changed, 10 insertions, 11 deletions
diff --git a/packaging/cert-svc.spec b/packaging/cert-svc.spec index 2c5eb41..fc71589 100644 --- a/packaging/cert-svc.spec +++ b/packaging/cert-svc.spec @@ -26,6 +26,7 @@ BuildRequires: ca-certificates BuildRequires: ca-certificates-devel Requires: ca-certificates Requires: ca-certificates-tizen +Requires: security-config %global TZ_SYS_BIN %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir} %global TZ_SYS_ETC %{?TZ_SYS_ETC:%TZ_SYS_ETC}%{!?TZ_SYS_ETC:/opt/etc} @@ -144,8 +145,8 @@ fi %_unitdir/sockets.target.wants/cert-server.socket %_libdir/libcert-svc-vcore.so.* %TZ_SYS_BIN/cert-server -%attr(-, system, system) %CERT_SVC_PATH -%attr(-, system, system) %CERT_SVC_RO_PATH +%attr(-, security_fw, security_fw) %CERT_SVC_PATH +%attr(-, security_fw, security_fw) %CERT_SVC_RO_PATH %files devel %_includedir/* diff --git a/systemd/cert-server.service.in b/systemd/cert-server.service.in index 1851379..4314672 100644 --- a/systemd/cert-server.service.in +++ b/systemd/cert-server.service.in @@ -3,8 +3,8 @@ Description=Start cert server for cert-svc managing root ssl certs [Service] ExecStart=@TZ_SYS_BIN@/cert-server -User=system -Group=system +User=security_fw +Group=security_fw Sockets=cert-server.socket [Install] diff --git a/systemd/cert-server.socket b/systemd/cert-server.socket index a9c7efe..9da7b39 100644 --- a/systemd/cert-server.socket +++ b/systemd/cert-server.socket @@ -1,7 +1,7 @@ [Socket] ListenStream=/tmp/CertSocket -SocketUser=system -SocketGroup=system +SocketUser=security_fw +SocketGroup=security_fw SocketMode=0777 Service=cert-server.service diff --git a/tests/pkcs12/CMakeLists.txt b/tests/pkcs12/CMakeLists.txt index 5fc78fd..f238fcc 100644 --- a/tests/pkcs12/CMakeLists.txt +++ b/tests/pkcs12/CMakeLists.txt @@ -20,7 +20,6 @@ PKG_CHECK_MODULES(PKCS12_TEST_DEP REQUIRED - libtzplatform-config ) SET(PKCS12_TEST_SOURCES diff --git a/tests/pkcs12/new_test_cases.cpp b/tests/pkcs12/new_test_cases.cpp index d93e63e..dc71c8b 100644 --- a/tests/pkcs12/new_test_cases.cpp +++ b/tests/pkcs12/new_test_cases.cpp @@ -24,6 +24,7 @@ #include <unistd.h> #include <cstring> #include <new> +#include <iostream> #include <openssl/err.h> #include <openssl/pkcs12.h> @@ -31,8 +32,6 @@ #include <openssl/x509.h> #include <openssl/pem.h> -#include <tzplatform_config.h> - #include <cert-svc/cinstance.h> #include <cert-svc/ccert.h> #include <cert-svc/cpkcs12.h> @@ -671,7 +670,7 @@ RUNNER_TEST(CERTSVC_PKCS12_1017_load_cert_list_from_store) RUNNER_TEST(CERTSVC_PKCS12_1018_get_duplicate_private_key) { - const char *privatekey_path = tzplatform_mkpath(TZ_SYS_SHARE, "cert-svc/pkcs12/temp.txt"); + const char *privatekey_path = CERTSVC_PKCS12_STORAGE_DIR "/temp.txt"; int result; @@ -985,7 +984,7 @@ RUNNER_TEST(CERTSVC_PKCS12_1027_get_alias_name_from_gname_from_store) char user_cert_path[512]; - const char *output_template = tzplatform_mkpath(TZ_SYS_SHARE, "cert-svc/pkcs12/file_%d"); + const char *output_template = CERTSVC_PKCS12_STORAGE_DIR "/file_%d"; snprintf(user_cert_path, sizeof(user_cert_path), output_template, count++); FILE *fp = fopen(user_cert_path, "w"); |