[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/, app-crypt/tpm2-openssl/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/, app-crypt/tpm2-openssl/files/

[David Seifert]

commit:     c87fddc6fa9bc08438b8302dc32ed2270241ed05
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Thu Sep 14 21:00:35 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Sep 14 21:00:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c87fddc6

app-crypt/tpm2-openssl: new package, add 1.1.1

Closes: https://github.com/gentoo/gentoo/pull/32714
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-crypt/tpm2-openssl/Manifest                    |  1 +
 ...de-base-provider-required-to-load-ecparam.patch | 25 ++++++
 app-crypt/tpm2-openssl/metadata.xml                | 15 ++++
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild   | 97 ++++++++++++++++++++++
 4 files changed, 138 insertions(+)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
new file mode 100644
index 000000000000..06860f330281
--- /dev/null
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -0,0 +1 @@
+DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

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
new file mode 100644
index 000000000000..5a5554628600
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
@@ -0,0 +1,25 @@
+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/metadata.xml b/app-crypt/tpm2-openssl/metadata.xml
new file mode 100644
index 000000000000..f02af2f290cf
--- /dev/null
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>salah.coronya@gmail.com</email>
+		<name>Christopher Byrne</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">tpm2-software/tpm2-openssl</remote-id>
+	</upstream>
+</pkgmetadata>

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
new file mode 100644
index 000000000000..54fda1a513cb
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${P}-tests-include-base-provider-required-to-load-ecparam.patch )
+
+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
+}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/, app-crypt/tpm2-openssl/files/

[Viorel Munteanu]

commit:     2ef819d458d4f23336adf2b3afdc65d716e22074
Author:     Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 22:50:34 2025 +0000
Commit:     Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 10:05:45 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ef819d4

app-crypt/tpm2-openssl: add 1.3.0

Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>

 app-crypt/tpm2-openssl/Manifest                    |  1 +
 ...m2-openssl-1.3.0-tests-remove-systemd-ism.patch | 12 ++++++
 app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild   | 48 ++++++++++++++++++++++
 3 files changed, 61 insertions(+)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 9086c8e08327..c8ed9053e321 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1 +1,2 @@
 DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d
+DIST tpm2-openssl-1.3.0.tar.gz 432730 BLAKE2B 458cf61324f28b6c9c7d970afa7a4fe4b22f556db986e6ae4db823e876e680e338145b5519b1e351006e43adaf6b7ee7639f42cd7d1ef0b9d96f833b6016c1e4 SHA512 7f226a7a3040fb33863e24d2c3712b2cc816d872c907ac4e05f38502bf52a979a522cad5a27f1984d3ce6cc75b6d4c5098ba025cce9eedac1b7f605300210650

diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch
new file mode 100644
index 000000000000..128b47c18cbe
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.3.0-tests-remove-systemd-ism.patch
@@ -0,0 +1,12 @@
+diff --git a/test/run-with-simulator b/test/run-with-simulator
+index e29b591..570e7a5 100755
+--- a/test/run-with-simulator
++++ b/test/run-with-simulator
+@@ -76,7 +76,6 @@ start_tpm2_abrmd() {
+     export TPM2TOOLS_TCTI
+     export TPM2OPENSSL_TCTI
+     sleep 1
+-    busctl --address="${DBUS_SESSION_BUS_ADDRESS}" list | grep "$tabrmd_name"
+ }
+ 
+ start_tpm2_sim_env() {

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild
new file mode 100644
index 000000000000..a8b8ade64d07
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2025 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="
+	dev-build/autoconf-archive
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch"
+	"${FILESDIR}/${PN}-1.3.0-tests-remove-systemd-ism.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_test() {
+	"${S}/test/run-with-simulator" swtpm skip-build || die
+}
+
+src_install() {
+	default
+	find "${ED}" -iname '*.la' -delete || die
+}