diff --git a/Hygon-Add-support-for-TCM-devices.patch b/Hygon-Add-support-for-TCM-devices.patch new file mode 100644 index 0000000000000000000000000000000000000000..7b007803551e4e42340a658c39925cb94fe23af4 --- /dev/null +++ b/Hygon-Add-support-for-TCM-devices.patch @@ -0,0 +1,42 @@ +From a12832040ba73e44e0b04a662df05eedbe3614fd Mon Sep 17 00:00:00 2001 +From: chench00 +Date: Wed, 27 Mar 2024 15:56:35 +0800 +Subject: [PATCH] [newfeature][all] Add support for TCM devices + +--- + dist/tpm2-abrmd.service.in | 5 +++-- + src/tabrmd-defaults.h | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/dist/tpm2-abrmd.service.in b/dist/tpm2-abrmd.service.in +index b0b562c..0effaa9 100644 +--- a/dist/tpm2-abrmd.service.in ++++ b/dist/tpm2-abrmd.service.in +@@ -2,8 +2,9 @@ + Description=TPM2 Access Broker and Resource Management Daemon + # These settings are needed when using the device TCTI. If the + # TCP mssim is used then the settings should be commented out. +-After=dev-tpm0.device +-Requires=dev-tpm0.device ++After=dev-tpm0.device dev-tcm0.device ++ConditionPathExists=|/dev/tpm0 ++ConditionPathExists=|/dev/tcm0 + + [Service] + Type=dbus +diff --git a/src/tabrmd-defaults.h b/src/tabrmd-defaults.h +index 7387a47..0396189 100644 +--- a/src/tabrmd-defaults.h ++++ b/src/tabrmd-defaults.h +@@ -16,7 +16,7 @@ + #define TABRMD_ENTROPY_SRC_DEFAULT "/dev/urandom" + #define TABRMD_SESSIONS_MAX_DEFAULT 4 + #define TABRMD_SESSIONS_MAX 64 +-#define TABRMD_TCTI_CONF_DEFAULT "device:/dev/tpm0" ++#define TABRMD_TCTI_CONF_DEFAULT ((!access("/dev/tcm0", F_OK)) ? ("device:/dev/tcm0") : ("device:/dev/tpm0")) + #define TABRMD_TRANSIENT_MAX_DEFAULT 27 + #define TABRMD_TRANSIENT_MAX 100 + +-- +2.25.1 + diff --git a/tpm2-abrmd.spec b/tpm2-abrmd.spec index ccb9966356da84d6be2e79dc5abc677e3019b170..26ffdc47d0b02e32b7c1387178e2bc895aceaaaf 100644 --- a/tpm2-abrmd.spec +++ b/tpm2-abrmd.spec @@ -2,12 +2,14 @@ Name: tpm2-abrmd Version: 3.0.0 -Release: 1 +Release: 2 Summary: A system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG License: BSD URL: https://github.com/tpm2-software/tpm2-abrmd Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz +Patch3001: Hygon-Add-support-for-TCM-devices.patch + BuildRequires: systemd pkgconfig(cmocka) pkgconfig(dbus-1) pkgconfig(gio-unix-2.0) pkgconfig(tss2-mu) pkgconfig(tss2-sys) BuildRequires: tpm2-tss-devel >= 2.4.0 libtool autoconf-archive libgcrypt libgcrypt-devel BuildRequires: chrpath @@ -136,6 +138,12 @@ fi %{_datadir}/selinux/packages/tabrmd.pp.bz2 %changelog +* Fri Aug 2 2024 chench - 3.0.0-2 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC: add support for TCM devices + * Tue Jul 18 2023 jinlun - 3.0.0-1 - Type:enhancement - ID:NA