Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
b4baee50b3
!54 fix bad date in changelog
From: @li_ning_jie 
Reviewed-by: @mailofzxf 
Signed-off-by: @mailofzxf
2024-11-11 12:27:56 +00:00
李宁杰
5a6251a70b fix bad date in changelog 2024-11-07 21:42:16 +08:00
openeuler-ci-bot
9578ec65e8
!51 [sync] PR-48: add support for TCM devices
From: @chench00 
Reviewed-by: @zhujianwei001 
Signed-off-by: @zhujianwei001
2024-09-10 14:04:11 +00:00
chench00
7991d83e43 add support for TCM devices 2024-09-10 15:19:15 +08:00
openeuler-ci-bot
7eb9cf4b50
!47 [sync] PR-45: Fix build check error
From: @openeuler-sync-bot 
Reviewed-by: @zhujianwei001 
Signed-off-by: @zhujianwei001
2024-09-05 03:16:49 +00:00
wxm
cc92eb6f22 Fix build check error
Signed-off-by: wxm <wangxiaomeng@kylinos.cn>
(cherry picked from commit 78e5bd0c8f19e3a6dd8419a16c48685f25ea9f12)
2024-05-09 16:58:27 +08:00
openeuler-ci-bot
e146904ab1
!40 tpm2-abrmd:update to 3.0.0
From: @jinlun123123 
Reviewed-by: @huangzq6 
Signed-off-by: @huangzq6
2023-07-22 02:43:27 +00:00
jinlun
a4ede5b4b2 tpm2-abrmd:update to 3.0.0 2023-07-18 14:35:05 +08:00
openeuler-ci-bot
f8e17285b9
!37 【轻量级 PR】:add code check in tpm2-abrmd
From: @jinlun123123 
Reviewed-by: @huangzq6 
Signed-off-by: @huangzq6
2023-01-13 03:33:58 +00:00
jinlun
6f3f95f059
add code check in tpm2-abrmd
Signed-off-by: jinlun <jinlun@huawei.com>
2023-01-12 02:45:06 +00:00
4 changed files with 80 additions and 5 deletions

View File

@ -0,0 +1,42 @@
From a12832040ba73e44e0b04a662df05eedbe3614fd Mon Sep 17 00:00:00 2001
From: chench00 <chench@hygon.cn>
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

Binary file not shown.

BIN
tpm2-abrmd-3.0.0.tar.gz Normal file

Binary file not shown.

View File

@ -1,17 +1,19 @@
%global selinuxtype targeted
Name: tpm2-abrmd
Version: 2.4.1
Release: 1
Version: 3.0.0
Release: 4
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
BuildRequires: selinux-policy-devel pkgconfig(systemd)
BuildRequires: selinux-policy-devel pkgconfig(systemd) dbus-daemon
# tpm2-abrmd depends on the package that contains itsSELinux policy module
Requires: (%{name}-selinux >= 2.3.3-2 if selinux-policy)
@ -52,7 +54,8 @@ autoreconf --install
--with-systemdsystemunitdir=%{_unitdir} \
--with-systemdpresetdir=%{_presetdir} \
--with-sepolicy \
--with-dbuspolicydir=%{_datadir}/dbus-1/system.d/
--with-dbuspolicydir=%{_datadir}/dbus-1/system.d/ \
--enable-unit
%make_build
@ -135,13 +138,43 @@ fi
%{_datadir}/selinux/packages/tabrmd.pp.bz2
%changelog
* Thu Nov 07 2024 liningjie <liningjie@xfusion.com> - 3.0.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: fix bad date in changelog
* Tue Sep 10 2024 chench <chench@hygon.cn> - 3.0.0-3
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: add support for TCM devices
* Wed Apr 10 2024 wangxiaomeng <wangxiaomeng@kylinos.cn> - 3.0.0-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:Fix build check error
* Tue Jul 18 2023 jinlun<jinlun@huawei.com> - 3.0.0-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update to 3.0.0
* Tue Jan 10 2023 jinlun <jinlun@huawei.com> - 2.4.1-2
- Type:enhancement
- ID:NA
- SUG:NA
- DESC: add code check in tpm2-abrmd
* Wed Nov 23 2022 jinlun<jinlun@huawei.com> - 2.4.1-1
- Type:enhancement
- ID:NA
- SUG:NA
- DESC:update to 2.4.1
* Thu Nov 3 wuzx<wuzx1226@qq.com> - 2.4.0-3
* Thu Nov 3 2022 wuzx<wuzx1226@qq.com> - 2.4.0-3
- Type:feature
- CVE:NA
- SUG:NA