* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/
@ 2023-09-16 16:46 Matthias Maier
0 siblings, 0 replies; 3+ messages in thread
From: Matthias Maier @ 2023-09-16 16:46 UTC (permalink / raw
To: gentoo-commits
commit: ae59aba546e498bc1a8a1ec17b4c070d6af489f9
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Fri Sep 15 16:45:01 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 16:36:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae59aba5
app-crypt/tpm2-openssl: Fix build with slibtool
Closes: https://bugs.gentoo.org/914239
Closes: https://github.com/gentoo/gentoo/pull/32814
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
...-undefined-references-when-using-slibtool.patch | 26 ++++++++++++++++++++++
.../tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild | 12 +++++++++-
2 files changed, 37 insertions(+), 1 deletion(-)
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch
new file mode 100644
index 000000000000..4045a940756f
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch
@@ -0,0 +1,26 @@
+From 8c87d708a168ab090f8e5fc01f2bf1db5103427d Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Fri, 15 Sep 2023 11:26:55 -0500
+Subject: [PATCH] build: Fix undefined references when using slibtool
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a0ad0d5..34a751c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -50,7 +50,7 @@ tpm2_la_LIBADD = $(TSS2_ESYS_LIBS) $(TSS2_TCTILDR_LIBS) $(LIBS) $(CODE_COVERAGE_
+ if TSS2_RC
+ tpm2_la_LIBADD += $(TSS2_RC_LIBS)
+ endif
+-tpm2_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
++tpm2_la_LDFLAGS = -module -avoid-version -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
+
+ check_PROGRAMS = test/selftest
+ test_selftest_SOURCES = test/selftest.c
+--
+2.41.0
+
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
index 9149a1e93139..a7e97911f696 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit autotools
+
DESCRIPTION="OpenSSL Provider for TPM2 integration"
HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl"
SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz"
@@ -24,7 +26,15 @@ DEPEND="${RDEPEND}
)"
BDEPEND="virtual/pkgconfig"
-PATCHES=( "${FILESDIR}"/${P}-tests-include-base-provider-required-to-load-ecparam.patch )
+PATCHES=(
+ "${FILESDIR}/${P}-tests-include-base-provider-required-to-load-ecparam.patch"
+ "${FILESDIR}/${P}-build-Fix-undefined-references-when-using-slibtool.patch"
+)
+
+src_prepare() {
+ eautoreconf
+ default
+}
src_test() {
dbus_run() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/
@ 2024-01-11 16:08 Viorel Munteanu
0 siblings, 0 replies; 3+ messages in thread
From: Viorel Munteanu @ 2024-01-11 16:08 UTC (permalink / raw
To: gentoo-commits
commit: f591da722da994c5bbc9ae3431bfffbfa65b7fe1
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Oct 14 20:42:30 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 16:07:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f591da72
app-crypt/tpm2-openssl: drop 1.1.1-r1
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33336
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-crypt/tpm2-openssl/Manifest | 1 -
...de-base-provider-required-to-load-ecparam.patch | 25 -----
.../tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild | 109 ---------------------
3 files changed, 135 deletions(-)
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 22745e950b20..9086c8e08327 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,2 +1 @@
-DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812
DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
deleted file mode 100644
index 5a5554628600..000000000000
--- a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001
-From: Petr Gotthard <petr.gotthard@advantech.cz>
-Date: Fri, 23 Dec 2022 10:46:40 +0100
-Subject: [PATCH] tests: include base provider required to load ecparam
-
----
- test/ec_genpkey_parameters.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh
-index 406b558..a4f68d7 100755
---- a/test/ec_genpkey_parameters.sh
-+++ b/test/ec_genpkey_parameters.sh
-@@ -6,7 +6,7 @@ set -eufx
- openssl ecparam -name prime256v1 -out testparam.pem
-
- # generate private key as PEM
--openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem
-+openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out testkey.pem
-
- # display private key info
- openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout
---
-2.39.2
-
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
deleted file mode 100644
index a420baf98c3a..000000000000
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="OpenSSL Provider for TPM2 integration"
-HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl"
-SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-crypt/tpm2-tss-3.2.0:=
- >=dev-libs/openssl-3:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm[gnutls(+)]
- app-crypt/tpm2-abrmd
- app-crypt/tpm2-tools
- )"
-BDEPEND="
- sys-devel/autoconf-archive
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${P}-tests-include-base-provider-required-to-load-ecparam.patch"
- "${FILESDIR}/${P}-build-Fix-undefined-references-when-using-slibtool.patch"
-)
-
-src_prepare() {
- eautoreconf
- default
-}
-
-src_test() {
- dbus_run() {
- (
- # start isolated dbus session bus
- local dbus_data=$(dbus-launch --sh-syntax) || exit
- eval "${dbus_data}"
-
- $@
- ret=${?}
-
- kill "${DBUS_SESSION_BUS_PID}"
- exit "${ret}"
- ) || die
- }
-
- tpm2_run_with_emulator() {
- local -x XDG_CONFIG_HOME="${T}"/.config/swtpm
- "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
-
- mkdir -p "${XDG_CONFIG_HOME}"/mytpm1 || die
- local swtpm_setup_args=(
- --tpm2
- --tpmstate "${XDG_CONFIG_HOME}"/mytpm1
- --createek
- --allow-signing
- --decryption
- --create-ek-cert
- --create-platform-cert
- --lock-nvram
- --overwrite
- --display
- )
- swtpm_setup "${swtpm_setup_args[@]}" || die
-
- local swtpm_socket_args=(
- --tpm2
- --tpmstate dir="${XDG_CONFIG_HOME}"/mytpm1
- --flags startup-clear
- --ctrl type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket.ctrl
- --server type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
- --pid file="${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid
- --daemon
- )
- swtpm socket "${swtpm_socket_args[@]}" || die
-
- local tpm2_abrmd_args=(
- --logger=stdout
- --tcti=swtpm:path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
- --session
- --flush-all
- )
- tpm2-abrmd "${tpm2_abrmd_args[@]}" &
-
- local -x TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
- local -x TPM2TOOLS_TCTI="tabrmd:bus_type=session"
-
- $@ || die
-
- # When swtpm dies, tmp2-abrmd will exit
- kill $(< "${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid) || die
- }
-
- dbus_run tpm2_run_with_emulator make check
-}
-
-src_install() {
- default
- find "${ED}" -iname '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/
@ 2024-03-16 9:09 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2024-03-16 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 0ea6df2205562e352e7dd6544eedb7aa235bd693
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Mon Feb 5 04:13:07 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 09:05:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea6df22
app-crypt/tpm2-openssl: Fix src_prepare and let upstream script setup TPM simulator
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35187
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
| 28 +++++
...2.0-tests-run-with-simulator-in-container.patch | 132 +++++++++++++++++++++
app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild | 67 +----------
3 files changed, 164 insertions(+), 63 deletions(-)
--git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch
new file mode 100644
index 000000000000..326fb10767f9
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch
@@ -0,0 +1,28 @@
+From be35c35ace48647bb73ae5028db7e8caaccd038d Mon Sep 17 00:00:00 2001
+From: Adrian Freihofer <adrian.freihofer@gmail.com>
+Date: Fri, 8 Dec 2023 14:24:17 +0100
+Subject: [PATCH 1/2] Makefile: add run-with-simulator to extra dists
+
+The run-with-simulator script is executed by the make check step of
+the rpm build process. Therefore it should be packaged into the release
+tar bundles.
+
+Signed-off-by: Adrian Freihofer <adrian.freihofer@gmail.com>
+---
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index 160d84e..994a8e3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -143,5 +143,6 @@ EXTRA_DIST = \
+ VERSION \
+ $(TESTS_SHELL) \
+ $(SH_LOG_COMPILER) \
++ test/run-with-simulator \
+ test/ec_pki/openssl.cnf \
+ test/rsa_pki/etc
+--
+2.43.0
+
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch
new file mode 100644
index 000000000000..33b51b6b1028
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.2.0-tests-run-with-simulator-in-container.patch
@@ -0,0 +1,132 @@
+diff --git a/home/salahx/Downloads/run-with-simulator b/home/salahx/Downloads/run-with-simulator
+new file mode 100755
+index 000000000000..e29b591f8d8b
+--- /dev/null
++++ b/test/run-with-simulator
+@@ -0,0 +1,126 @@
++#!/bin/bash
++# SPDX-License-Identifier: BSD-3-Clause
++
++SIM_PORT_DATA=2321
++SIM_PORT_CMD=$((SIM_PORT_DATA+1))
++
++# Run from top dir of this repository
++SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
++TOP_DIR="$(realpath "$SCRIPT_DIR/..")"
++cd "$TOP_DIR" || { echo "Error: cd to cd $TOP_DIR failed"; exit 1; }
++
++
++verify_simulator_is_running() {
++ local pid_tpm=$1
++
++ sleep 1
++ ss -lntp4 2> /dev/null | grep "${pid_tpm}" | grep -q "${SIM_PORT_DATA}"
++ ret_data=$?
++ ss -lntp4 2> /dev/null | grep "${pid_tpm}" | grep -q "${SIM_PORT_CMD}"
++ ret_cmd=$?
++ if [ $ret_data -eq 0 ] && [ $ret_cmd -eq 0 ]; then
++ echo "Simulator with PID ${pid_tpm} bound to port ${SIM_PORT_DATA} and ${SIM_PORT_CMD} successfully."
++ return 0
++ else
++ echo "Error: Port conflict? Cleaning up PID: ${pid_tpm}"
++ return 1
++ fi
++}
++
++build_tpm2_simulator_ibm() (
++ test -d ibmtpm && return
++ echo "---> compiling IBM tpm simulator"
++ mkdir ibmtpm
++ curl -Ls https://downloads.sourceforge.net/project/ibmswtpm2/ibmtpm1682.tar.gz | tar xz -C ibmtpm
++ cd ibmtpm/src && make
++)
++
++start_tpm2_simulator_ibm () {
++ build_tpm2_simulator_ibm || return 1
++
++ echo "---> starting IBM tpm simulator"
++ ibmtpm/src/tpm_server &
++ pid_tpm=$!
++ verify_simulator_is_running $pid_tpm
++}
++
++start_tpm2_simulator_swtpm () {
++ echo "---> starting swtpm simulator"
++ swtpm socket --tpm2 \
++ --server port=$SIM_PORT_DATA \
++ --ctrl type=tcp,port=$SIM_PORT_CMD \
++ --flags not-need-init \
++ --tpmstate dir="$PWD" \
++ --seccomp action=none &
++ pid_tpm=$!
++ verify_simulator_is_running $pid_tpm
++}
++
++start_dbusd () {
++ echo "---> starting dbus daemon"
++ dbus-daemon --session --print-address > /tmp/bus-socket-path.txt &
++ sleep 1
++ DBUS_SESSION_BUS_ADDRESS="$(tail -n1 /tmp/bus-socket-path.txt)"
++ export DBUS_SESSION_BUS_ADDRESS
++}
++
++start_tpm2_abrmd() {
++ local tabrmd_tcti=$1
++
++ echo "---> starting abrmd"
++ local tabrmd_name="com.intel.tss2.Tabrmd${SIM_PORT_DATA}"
++ tpm2-abrmd --session --dbus-name="${tabrmd_name}" --tcti "${tabrmd_tcti}:host=localhost,port=${SIM_PORT_DATA}" &
++ TCTI_ADDRESS="tabrmd:bus_name=${tabrmd_name},bus_type=session"
++ TPM2TOOLS_TCTI="$TCTI_ADDRESS"
++ TPM2OPENSSL_TCTI="$TCTI_ADDRESS"
++ export TPM2TOOLS_TCTI
++ export TPM2OPENSSL_TCTI
++ sleep 1
++# busctl --address="${DBUS_SESSION_BUS_ADDRESS}" list | grep "$tabrmd_name"
++}
++
++start_tpm2_sim_env() {
++ local sim_type=$1
++
++ start_dbusd
++
++ if [ "$sim_type" = "swtpm" ]; then
++ start_tpm2_simulator_swtpm || return 1
++ start_tpm2_abrmd swtpm || return 1
++ elif [ "$sim_type" = "ibm" ]; then
++ start_tpm2_simulator_ibm || return 1
++ start_tpm2_abrmd mssim || return 1
++ else
++ echo "invalid tpm simulator typ"
++ return 1
++ fi
++}
++
++make_check () {
++ echo "Running make check"
++ openssl version
++ tpm2_getcap properties-fixed | head -n 20
++ make check
++}
++
++function cleanup()
++{
++ pkill -P $$
++}
++trap cleanup EXIT
++
++build_tpm2_openssl() {
++ ./bootstrap
++ ./configure CC=gcc --enable-op-digest --enable-op-cipher
++ make
++}
++
++SIM_TYPE=${1:-swtpm}
++SKIP_BUILD=${2:-build}
++if [ "$SKIP_BUILD" = "skip-build" ]; then
++ echo "Skipping the build"
++else
++ build_tpm2_openssl || { echo "Compiling tpm2-openssl failed"; exit 1; }
++fi
++start_tpm2_sim_env "${SIM_TYPE}" || { echo "Starting tpm2 simulator failed ($SIM_TYPE)"; exit 1; }
++make_check || { echo "tpm2-openssl make check failed"; exit 1; }
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
index c2be93546c0c..03767401d089 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
@@ -29,77 +29,18 @@ BDEPEND="
virtual/pkgconfig"
PATCHES=(
+ "${FILESDIR}/${PN}-1.2.0-tests-run-with-simulator-in-container.patch"
+ "${FILESDIR}/${PN}-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch"
"${FILESDIR}/${PN}-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch"
)
src_prepare() {
- eautoreconf
default
+ eautoreconf
}
src_test() {
- dbus_run() {
- (
- # start isolated dbus session bus
- local dbus_data=$(dbus-launch --sh-syntax) || exit
- eval "${dbus_data}"
-
- $@
- ret=${?}
-
- kill "${DBUS_SESSION_BUS_PID}"
- exit "${ret}"
- ) || die
- }
-
- tpm2_run_with_emulator() {
- local -x XDG_CONFIG_HOME="${T}"/.config/swtpm
- "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
-
- mkdir -p "${XDG_CONFIG_HOME}"/mytpm1 || die
- local swtpm_setup_args=(
- --tpm2
- --tpmstate "${XDG_CONFIG_HOME}"/mytpm1
- --createek
- --allow-signing
- --decryption
- --create-ek-cert
- --create-platform-cert
- --lock-nvram
- --overwrite
- --display
- )
- swtpm_setup "${swtpm_setup_args[@]}" || die
-
- local swtpm_socket_args=(
- --tpm2
- --tpmstate dir="${XDG_CONFIG_HOME}"/mytpm1
- --flags startup-clear
- --ctrl type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket.ctrl
- --server type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
- --pid file="${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid
- --daemon
- )
- swtpm socket "${swtpm_socket_args[@]}" || die
-
- local tpm2_abrmd_args=(
- --logger=stdout
- --tcti=swtpm:path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
- --session
- --flush-all
- )
- tpm2-abrmd "${tpm2_abrmd_args[@]}" &
-
- local -x TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
- local -x TPM2TOOLS_TCTI="tabrmd:bus_type=session"
-
- $@ || die
-
- # When swtpm dies, tmp2-abrmd will exit
- kill $(< "${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid) || die
- }
-
- dbus_run tpm2_run_with_emulator make check
+ "${S}/test/run-with-simulator" swtpm skip-build || die
}
src_install() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-03-16 9:09 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-16 9:09 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2024-01-11 16:08 Viorel Munteanu
2023-09-16 16:46 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox