From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2F443158094 for ; Tue, 27 Sep 2022 22:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5100DE0825; Tue, 27 Sep 2022 22:09:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 383C1E0825 for ; Tue, 27 Sep 2022 22:09:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 274D4340FAB for ; Tue, 27 Sep 2022 22:09:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72123584 for ; Tue, 27 Sep 2022 22:09:27 +0000 (UTC) From: "Christopher Byrne" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christopher Byrne" Message-ID: <1664316552.f967da3dc0d646f757b7a7807ee89f7e0181dbc7.salah.coronya@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild X-VCS-Directories: app-crypt/tpm2-openssl/ X-VCS-Committer: salah.coronya X-VCS-Committer-Name: Christopher Byrne X-VCS-Revision: f967da3dc0d646f757b7a7807ee89f7e0181dbc7 X-VCS-Branch: dev Date: Tue, 27 Sep 2022 22:09:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c298ca68-592b-4abc-90c8-3076b4dcfd2f X-Archives-Hash: a7f3b8ab835714f8fd782c45c9bf4a78 commit: f967da3dc0d646f757b7a7807ee89f7e0181dbc7 Author: Christopher Byrne gmail com> AuthorDate: Tue Sep 27 22:05:33 2022 +0000 Commit: Christopher Byrne gmail com> CommitDate: Tue Sep 27 22:09:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=f967da3d app-crypt/tpm2-openssl: Enable tests Signed-off-by: Christopher Byrne gmail.com> app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 76 ++++++++++++++++++++++-- 1 file changed, 72 insertions(+), 4 deletions(-) diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild index bce9e94a4..2cb119589 100644 --- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild +++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild @@ -13,18 +13,82 @@ LICENSE="BSD" SLOT="0/${PV}" KEYWORDS="~amd64" - -# Needs IBM's software TPM simulator, which isn't in Portage -RESTRICT="test" +IUSE="test" RDEPEND=">=app-crypt/tpm2-tss-3.2.0:= =dev-libs/openssl-3.0*:0=" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + test? ( app-crypt/swtpm + app-crypt/tpm2-abrmd + app-crypt/tpm2-tools )" BDEPEND="sys-devel/autoconf-archive virtual/pkgconfig" +RESTRICT="!test? ( test )" + +dbus_run() { + ( + # start isolated dbus session bus + dbus_data=$(dbus-launch --sh-syntax) || exit + eval "${dbus_data}" + + $@ + ret=${?} + + kill "${DBUS_SESSION_BUS_PID}" + exit "${ret}" + ) || die +} + +tpm2_run_with_emulator() { + export XDG_CONFIG_HOME=${T}/.config/swtpm + "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die + + mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die + 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 + + 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 + + tpm2_abrmd_args=( + --logger=stdout + --tcti=swtpm:path=${XDG_CONFIG_HOME}/mytpm1/swtpm.socket + --session + --flush-all + ) + tpm2-abrmd "${tpm2_abrmd_args[@]}" & + + export TPM2OPENSSL_TCTI="tabrmd:bus_type=session" + export TPM2TOOLS_TCTI="tabrmd:bus_type=session" + + $@ || die + + # When swtpm dies, tmp2-abrmd will exit + kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die +} + src_prepare() { # See bug #833887 (and similar); eautoreconf means version information # could be incorrectly embedded @@ -42,3 +106,7 @@ src_install() { # No libtool files are install, so nothing to check for bug #833887 } + +src_test() { + dbus_run tpm2_run_with_emulator make check +}