%global watchdog_enabled 1
%global watchdog_timeout_sec 60
%global watchdog_notify_sec 20
-%global tz_backend_enabled 0
+%global tz_backend_enabled %{?tz_backend:%tz_backend}%{!?tz_backend:OFF}
Name: key-manager
Summary: Central Key Manager and utilities
-Version: 0.1.26
+Version: 0.1.33
Release: 1
Group: Security/Secure Storage
License: Apache-2.0 and BSD-3-Clause
BuildRequires: cmake
BuildRequires: zip
BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(openssl)
+BuildRequires: pkgconfig(openssl1.1)
BuildRequires: libattr-devel
BuildRequires: pkgconfig(libsmack)
BuildRequires: pkgconfig(libsystemd-daemon)
%endif
BuildRequires: boost-devel
BuildRequires: ca-certificates-devel
-%if %{tz_backend_enabled} == 1
+%if %{tz_backend_enabled} == ON
BuildRequires: key-manager-ta-devel
BuildRequires: key-manager-ta-serialization-devel
BuildRequires: pkgconfig(tef-libteec)
%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 %{rw_data_dir}/initial_values
+%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
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
-DRW_ETC_DIR=%{rw_etc_dir} \
-DRO_ETC_DIR=%{ro_etc_dir} \
-DBIN_DIR=%{bin_dir} \
- -DINITIAL_VALUES_DIR=%{initial_values_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} == 1
+%if %{tz_backend_enabled} == ON
-DTZ_BACKEND_ENABLED=ON \
%else
-DTZ_BACKEND_ENABLED=OFF \
%{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
%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}
+%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
%{_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
%{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