X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fkey-manager.spec;h=883f60db120e69f38bd4ab723eef7f8f1ba6351f;hb=b48ce806a3be66c66ab18da5496a868cf0cafe11;hp=fe95482ff809540bdef30033099938cf438be548;hpb=051d69728511bf8ed4f4fcd24f27d10f015cec4a;p=platform%2Fcore%2Fsecurity%2Fkey-manager.git

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index fe95482..883f60d 100644
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -1,19 +1,23 @@
+%global watchdog_enabled 1
+%global watchdog_timeout_sec 60
+%global watchdog_notify_sec  20
+%global tz_backend_enabled %{?tz_backend:%tz_backend}%{!?tz_backend:OFF}
+
 Name:       key-manager
 Summary:    Central Key Manager and utilities
-Version:    0.1.20
+Version:    0.1.33
 Release:    1
-Group:      System/Security
-License:    Apache-2.0 and BSL-1.0
+Group:      Security/Secure Storage
+License:    Apache-2.0 and BSD-3-Clause
 Source0:    %{name}-%{version}.tar.gz
 Source1001: key-manager-pam-plugin.manifest
 Source1002: libkey-manager-client.manifest
 Source1003: libkey-manager-client-devel.manifest
 Source1004: libkey-manager-common.manifest
-Source1005: key-manager-tests.manifest
 BuildRequires: cmake
 BuildRequires: zip
 BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(openssl1.1)
 BuildRequires: libattr-devel
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(libsystemd-daemon)
@@ -26,22 +30,39 @@ BuildRequires: pkgconfig(cynara-creds-socket)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(pkgmgr)
+BuildRequires: pkgconfig(vconf)
+%if 0%{?watchdog_enabled}
+BuildRequires: pkgconfig(argos_watchdog)
+%endif
 BuildRequires: boost-devel
-Requires(pre): pwdutils
-Requires(pre): tizen-platform-config-tools
-Requires(postun): pwdutils
+BuildRequires: ca-certificates-devel
+%if %{tz_backend_enabled} == ON
+BuildRequires: key-manager-ta-devel
+BuildRequires: key-manager-ta-serialization-devel
+BuildRequires: pkgconfig(tef-libteec)
+%endif
 Requires: libkey-manager-common = %{version}-%{release}
+
 %{?systemd_requires}
 
 %global user_name key-manager
-%global group_name key-manager
+%global group_name security_fw
+%global supplementary_group_names key-manager
 %global service_name key-manager
-%global _rundir /run
 %global smack_domain_name System
-%global rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm/}%{!?TZ_SYS_DATA:/opt/data/ckm/}
-%global ro_data_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm/}%{!?TZ_SYS_SHARE:/usr/share/ckm/}
-%global db_test_dir %{?TZ_SYS_SHARE:%TZ_SYS_SHARE/ckm-db-test/}%{!?TZ_SYS_SHARE:/usr/share/ckm-db-test/}
-%global initial_values_dir %{rw_data_dir}initial_values/
+%global old_rw_data_dir /opt/data/ckm
+%global rw_data_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm}%{!?TZ_SYS_DATA:%old_rw_data_dir}
+%global ro_data_dir %{?TZ_SYS_RO_SHARE:%TZ_SYS_RO_SHARE/ckm}%{!?TZ_SYS_RO_SHARE:%_datadir/ckm}
+%global test_dir %{?TZ_SYS_DATA:%TZ_SYS_DATA/ckm-tests-internal}%{!?TZ_SYS_DATA:%/opt/data/ckm-tests-internal}
+%global bin_dir %{?TZ_SYS_BIN:%TZ_SYS_BIN}%{!?TZ_SYS_BIN:%_bindir}
+# image creation error occured if /usr/sbin used for ldconfig
+#%global sbin_dir %{?TZ_SYS_SBIN:%TZ_SYS_SBIN}%{!?TZ_SYS_SBIN:%_sbindir}
+%global sbin_dir /sbin
+%global ro_etc_dir %{?TZ_SYS_RO_ETC:%TZ_SYS_RO_ETC}%{!?TZ_SYS_RO_ETC:/etc}
+%global run_dir %{?TZ_SYS_RUN:%TZ_SYS_RUN}%{!?TZ_SYS_RUN:/var/run}
+%global initial_values_dir_ro %{ro_data_dir}/initial_values
+%global initial_values_dir_rw %{rw_data_dir}/initial_values
+%global ca_certs_dir %{?TZ_SYS_CA_CERTS:%TZ_SYS_CA_CERTS}%{!?TZ_SYS_CA_CERTS:%ro_etc_dir/ssl/certs}
 
 %description
 Central Key Manager daemon could be used as secure storage
@@ -50,27 +71,30 @@ application to sign and verify (DSA/RSA/ECDSA) signatures.
 
 %package -n libkey-manager-common
 Summary:    Central Key Manager (common libraries)
-Group:      Development/Libraries
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Group:      Security/Libraries
+License:    Apache-2.0
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n libkey-manager-common
 Central Key Manager package (common library)
 
 %package -n libkey-manager-client
 Summary:    Central Key Manager (client)
-Group:      Development/Libraries
+Group:      Security/Libraries
+License:    Apache-2.0
 Requires:   key-manager = %{version}-%{release}
 Requires:   libkey-manager-common = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n libkey-manager-client
 Central Key Manager package (client)
 
 %package -n libkey-manager-client-devel
 Summary:    Central Key Manager (client-devel)
-Group:      Development/Libraries
+Group:      Security/Development
+License:    Apache-2.0
 BuildRequires: pkgconfig(capi-base-common)
 Requires:   pkgconfig(capi-base-common)
 Requires:   libkey-manager-client = %{version}-%{release}
@@ -80,7 +104,8 @@ Central Key Manager package (client-devel)
 
 %package -n key-manager-tests
 Summary:    Internal test for key-manager
-Group:      Development
+Group:      Security/Testing
+License:    Apache-2.0 and BSL-1.0
 BuildRequires: pkgconfig(libxml-2.0)
 Requires:   boost-test
 Requires:   key-manager = %{version}-%{release}
@@ -90,24 +115,32 @@ Internal test for key-manager implementation.
 
 %package -n key-manager-pam-plugin
 Summary:    CKM login/password module to PAM
-Group:      Development/Libraries
+Group:      Security/Libraries
+License:    Apache-2.0
 BuildRequires: pam-devel
 Requires:   key-manager = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
 
 %description -n key-manager-pam-plugin
 CKM login/password module to PAM. Used to monitor user login/logout
 and password change events from PAM
 
+%package -n key-manager-initial-values
+Summary:    CKM initial values tool
+Group:      Security/Libraries
+License:    Apache-2.0
+BuildRequires: cmake
+BuildRequires: pkgconfig(openssl1.1)
+BuildRequires: pkgconfig(libxml-2.0)
+Requires(post): %{sbin_dir}/ldconfig
+Requires(postun): %{sbin_dir}/ldconfig
+
+%description -n key-manager-initial-values
+Includes ckm_initial_values tool for initial values XML generation
 
 %prep
 %setup -q
-cp -a %{SOURCE1001} .
-cp -a %{SOURCE1002} .
-cp -a %{SOURCE1003} .
-cp -a %{SOURCE1004} .
-cp -a %{SOURCE1005} .
 
 %build
 %if 0%{?sec_build_binary_debug_enable}
@@ -116,96 +149,86 @@ cp -a %{SOURCE1005} .
     export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
-
 export LDFLAGS+="-Wl,--rpath=%{_libdir},-Bsymbolic-functions "
 
 %cmake . -DVERSION=%{version} \
         -DCMAKE_BUILD_TYPE=%{?build_type:%build_type}%{!?build_type:RELEASE} \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
         -DSYSTEMD_UNIT_DIR=%{_unitdir} \
-        -DSYSTEMD_ENV_FILE="/etc/sysconfig/central-key-manager" \
-        -DRUN_DIR:PATH=%{_rundir} \
+        -DSYSTEMD_ENV_FILE=%{ro_etc_dir}"/sysconfig/central-key-manager" \
+        -DRUN_DIR:PATH=%{run_dir} \
         -DSERVICE_NAME=%{service_name} \
         -DUSER_NAME=%{user_name} \
         -DGROUP_NAME=%{group_name} \
+        -DSUPPLEMENTARY_GROUP_NAMES="%{supplementary_group_names}" \
         -DSMACK_DOMAIN_NAME=%{smack_domain_name} \
-        -DMOCKUP_SM=%{?mockup_sm:%mockup_sm}%{!?mockup_sm:OFF} \
+        -DOLD_RW_DATA_DIR=%{old_rw_data_dir} \
         -DRW_DATA_DIR=%{rw_data_dir} \
         -DRO_DATA_DIR=%{ro_data_dir} \
-        -DINITIAL_VALUES_DIR=%{initial_values_dir} \
-        -DDB_TEST_DIR=%{db_test_dir}
+        -DRW_ETC_DIR=%{rw_etc_dir} \
+        -DRO_ETC_DIR=%{ro_etc_dir} \
+        -DBIN_DIR=%{bin_dir} \
+        -DINITIAL_VALUES_DIR_RW=%{initial_values_dir_rw} \
+        -DINITIAL_VALUES_DIR_RO=%{initial_values_dir_ro} \
+        -DCA_CERTS_DIR=%{ca_certs_dir} \
+%if 0%{?watchdog_enabled}
+        -DWATCHDOG_ENABLED=%{watchdog_enabled} \
+        -DWATCHDOG_TIMEOUT_SEC=%{watchdog_timeout_sec} \
+        -DWATCHDOG_NOTIFY_SEC=%{watchdog_notify_sec} \
+%endif
+%if %{tz_backend_enabled} == ON
+        -DTZ_BACKEND_ENABLED=ON \
+%else
+        -DTZ_BACKEND_ENABLED=OFF \
+%endif
+        -DTEST_DIR=%{test_dir}
 
 make %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{initial_values_dir}
-mkdir -p %{buildroot}/etc/security/
-mkdir -p %{buildroot}%{ro_data_dir}/scripts
-mkdir -p %{buildroot}/etc/gumd/userdel.d/
-cp data/scripts/*.sql %{buildroot}%{ro_data_dir}/scripts
-cp doc/initial_values.xsd %{buildroot}%{ro_data_dir}
-cp doc/sw_key.xsd %{buildroot}%{ro_data_dir}
-cp data/gumd/10_key-manager.post %{buildroot}/etc/gumd/userdel.d/
-
-mkdir -p %{buildroot}%{db_test_dir}
-cp tests/testme_ver1.db %{buildroot}%{db_test_dir}
-cp tests/testme_ver2.db %{buildroot}%{db_test_dir}
-cp tests/testme_ver3.db %{buildroot}%{db_test_dir}
-cp tests/XML_1_okay.xml %{buildroot}%{db_test_dir}
-cp tests/XML_1_okay.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_1_wrong.xml %{buildroot}%{db_test_dir}
-cp tests/XML_1_wrong.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_2_structure.xml %{buildroot}%{db_test_dir}
-cp tests/XML_3_encrypted.xml %{buildroot}%{db_test_dir}
-cp tests/XML_3_encrypted.xsd %{buildroot}%{db_test_dir}
-cp tests/XML_4_device_key.xml %{buildroot}%{db_test_dir}
-cp tests/XML_4_device_key.xsd %{buildroot}%{db_test_dir}
-cp tests/encryption-scheme/db/db-7654 %{buildroot}%{db_test_dir}/db-7654
-cp tests/encryption-scheme/db/db-key-7654 %{buildroot}%{db_test_dir}/db-key-7654
-cp tests/encryption-scheme/db/key-7654 %{buildroot}%{db_test_dir}/key-7654
-
 %make_install
 %install_service multi-user.target.wants central-key-manager.service
 %install_service sockets.target.wants central-key-manager-api-control.socket
 %install_service sockets.target.wants central-key-manager-api-storage.socket
 %install_service sockets.target.wants central-key-manager-api-ocsp.socket
 %install_service sockets.target.wants central-key-manager-api-encryption.socket
+cp -a %{SOURCE1001} %{SOURCE1002} %{SOURCE1003} %{SOURCE1004} %{buildroot}%{_datadir}/
 
 %pre
+# tzplatform-get sync breaked because of on-development situation. comment out just for temporary
 # fail if runtime dir variable is different than compilation time variable
-if [ `tzplatform-get TZ_SYS_DATA | cut -d'=' -f2` != %{TZ_SYS_DATA} ]
-then
-    echo "Runtime value of TZ_SYS_DATA is different than the compilation time value. Aborting"
-    exit 1
-fi
-if [ `tzplatform-get TZ_SYS_SHARE | cut -d'=' -f2` != %{TZ_SYS_SHARE} ]
-then
-    echo "Runtime value of TZ_SYS_SHARE is different than the compilation time value. Aborting"
-    exit 1
-fi
-
+#if [ `tzplatform-get TZ_SYS_DATA | cut -d'=' -f2` != %{TZ_SYS_DATA} ]
+#then
+#    echo "Runtime value of TZ_SYS_DATA is different than the compilation time value. Aborting"
+#    exit 1
+#fi
+#if [ `tzplatform-get TZ_SYS_RO_SHARE | cut -d'=' -f2` != %{TZ_SYS_RO_SHARE} ]
+#then
+#    echo "Runtime value of TZ_SYS_RO_SHARE is different than the compilation time value. Aborting"
+#    exit 1
+#fi
+
+## backup plan for manage key-manager user/group is deprecated b/c pwdutils package
+## would be excluded from binary
 # User/group (key-manager/key-manager) should be already added in passwd package.
 # This is our backup plan if passwd package will not be configured correctly.
-id -g %{group_name} > /dev/null 2>&1
-if [ $? -eq 1 ]; then
-    groupadd %{group_name} -r > /dev/null 2>&1
-fi
-
-id -u %{user_name} > /dev/null 2>&1
-if [ $? -eq 1 ]; then
-    useradd -d /var/lib/empty -s /sbin/nologin -r -g %{group_name} %{user_name} > /dev/null 2>&1
-fi
-
-%clean
-rm -rf %{buildroot}
+#id -g %{group_name} > /dev/null 2>&1
+#if [ $? -eq 1 ]; then
+#    groupadd %{group_name} -r > /dev/null 2>&1
+#fi
+#
+#id -u %{user_name} > /dev/null 2>&1
+#if [ $? -eq 1 ]; then
+#    useradd -d /var/lib/empty -s %{sbin_dir}/nologin -r -g %{group_name} %{user_name} > /dev/null 2>&1
+#fi
 
 %post
 # move data from old path to new one
 # we have to assume that in case of TZ_SYS_DATA change some upgrade script will move all the data
-if [ -d "/opt/data/ckm" ]
+if [ -d "%{old_rw_data_dir}" ] && [ "%{rw_data_dir}" != "%{old_rw_data_dir}" ]
 then
-    cp -a /opt/data/ckm/. %{rw_data_dir} && rm -rf /opt/data/ckm
+    echo "Migrating old rw data to new rw data dir"
+    cp -a %{old_rw_data_dir}/. %{rw_data_dir}/ && rm -rf %{old_rw_data_dir}
 fi
 
 systemctl daemon-reload
@@ -236,19 +259,18 @@ if [ $1 = 0 ]; then
     systemctl daemon-reload
 fi
 
-%post -n libkey-manager-common -p /sbin/ldconfig
-%post -n libkey-manager-client -p /sbin/ldconfig
-%postun -n libkey-manager-common -p /sbin/ldconfig
-%postun -n libkey-manager-client -p /sbin/ldconfig
+%post -n libkey-manager-common -p %{sbin_dir}/ldconfig
+%post -n libkey-manager-client -p %{sbin_dir}/ldconfig
+%postun -n libkey-manager-common -p %{sbin_dir}/ldconfig
+%postun -n libkey-manager-client -p %{sbin_dir}/ldconfig
 
 %files -n key-manager
 %manifest key-manager.manifest
 %license LICENSE
-%license LICENSE.BSL-1.0
-%{_bindir}/key-manager
+%license LICENSE.BSD-3-Clause
+%{bin_dir}/key-manager
 %{_unitdir}/multi-user.target.wants/central-key-manager.service
 %{_unitdir}/central-key-manager.service
-%{_unitdir}/central-key-manager.target
 %{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket
 %{_unitdir}/central-key-manager-api-control.socket
 %{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket
@@ -257,35 +279,35 @@ fi
 %{_unitdir}/central-key-manager-api-ocsp.socket
 %{_unitdir}/sockets.target.wants/central-key-manager-api-encryption.socket
 %{_unitdir}/central-key-manager-api-encryption.socket
-%dir %{_datadir}/ckm
-%dir %{_datadir}/ckm/scripts
-%{_datadir}/ckm/initial_values.xsd
-%{_datadir}/ckm/sw_key.xsd
-%{_datadir}/ckm/scripts/*.sql
+%dir %{ro_data_dir}
+%{ro_data_dir}/*
 %dir %attr(770, %{user_name}, %{group_name}) %{rw_data_dir}
-%dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir}
-/etc/opt/upgrade/230.key-manager-change-data-dir.patch.sh
-/etc/opt/upgrade/231.key-manager-migrate-dkek.patch.sh
-/etc/opt/upgrade/232.key-manager-change-user.patch.sh
-/etc/gumd/userdel.d/10_key-manager.post
-%{_bindir}/ckm_tool
+%dir %attr(550, %{user_name}, %{group_name}) %{initial_values_dir_ro}
+%dir %attr(770, %{user_name}, %{group_name}) %{initial_values_dir_rw}
+%attr(755,root,root) /usr/share/upgrade/scripts/295.key-manager_upgrade.sh
+
+%{ro_etc_dir}/gumd/userdel.d/10_key-manager.post
+%{bin_dir}/ckm_tool
 
 %files -n key-manager-pam-plugin
-%manifest key-manager-pam-plugin.manifest
+%manifest %{_datadir}/key-manager-pam-plugin.manifest
+%license LICENSE
 %{_libdir}/security/pam_key_manager_plugin.so*
 
 %files -n libkey-manager-common
-%manifest libkey-manager-common.manifest
+%manifest %{_datadir}/libkey-manager-common.manifest
+%license LICENSE
 %{_libdir}/libkey-manager-common.so.*
 
 %files -n libkey-manager-client
-%manifest libkey-manager-client.manifest
+%manifest %{_datadir}/libkey-manager-client.manifest
 %license LICENSE
 %{_libdir}/libkey-manager-client.so.*
 %{_libdir}/libkey-manager-control-client.so.*
 
 %files -n libkey-manager-client-devel
-%manifest libkey-manager-client-devel.manifest
+%manifest %{_datadir}/libkey-manager-client-devel.manifest
+%license LICENSE
 %{_libdir}/libkey-manager-client.so
 %{_libdir}/libkey-manager-control-client.so
 %{_libdir}/libkey-manager-common.so
@@ -299,6 +321,7 @@ fi
 %{_includedir}/ckm/ckm/ckm-pkcs12.h
 %{_includedir}/ckm/ckm/ckm-raw-buffer.h
 %{_includedir}/ckm/ckm/ckm-type.h
+%{_includedir}/ckm/ckm/ckm-zero-memory.h
 %{_includedir}/ckm/ckmc/ckmc-manager.h
 %{_includedir}/ckm/ckmc/ckmc-control.h
 %{_includedir}/ckm/ckmc/ckmc-error.h
@@ -307,25 +330,15 @@ fi
 
 %files -n key-manager-tests
 %manifest key-manager-tests.manifest
-%{_bindir}/ckm-tests-internal
-%dir %{_datadir}/ckm-db-test
-%{_datadir}/ckm-db-test/testme_ver1.db
-%{_datadir}/ckm-db-test/testme_ver2.db
-%{_datadir}/ckm-db-test/testme_ver3.db
-%{_datadir}/ckm-db-test/XML_1_okay.xml
-%{_datadir}/ckm-db-test/XML_1_okay.xsd
-%{_datadir}/ckm-db-test/XML_1_wrong.xml
-%{_datadir}/ckm-db-test/XML_1_wrong.xsd
-%{_datadir}/ckm-db-test/XML_2_structure.xml
-%{_datadir}/ckm-db-test/XML_3_encrypted.xml
-%{_datadir}/ckm-db-test/XML_3_encrypted.xsd
-%{_datadir}/ckm-db-test/XML_4_device_key.xml
-%{_datadir}/ckm-db-test/XML_4_device_key.xsd
-%{_datadir}/ckm-db-test/db-7654
-%{_datadir}/ckm-db-test/db-key-7654
-%{_datadir}/ckm-db-test/key-7654
-%{_datadir}/ckm-db-test/encryption-scheme.p12
-%{_bindir}/ckm_so_loader
-%{_bindir}/ckm_db_tool
-%{_bindir}/ckm_generate_db
-
+%license LICENSE
+%license LICENSE.BSL-1.0
+%{bin_dir}/ckm-tests-internal
+%{bin_dir}/ckm_so_loader
+%{bin_dir}/ckm_db_tool
+%{bin_dir}/ckm_db_merge
+%{bin_dir}/ckm_generate_db
+%test_dir
+
+%files -n key-manager-initial-values
+%license LICENSE
+%{bin_dir}/ckm_initial_values