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

2023-09-15 Thread David Roman 
commit: 855fd6909c8be9cb1c7ef50551c070e64f1871a1
Author: David Roman  gmail  com>
AuthorDate: Fri Sep 15 15:27:31 2023 +
Commit: David Roman  gmail  com>
CommitDate: Fri Sep 15 15:27:37 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=855fd690

app-crypt/tpm2-openssl: treeclean, moved to ::gentoo

Signed-off-by: David Roman  gmail.com>

 app-crypt/tpm2-openssl/Manifest|   1 -
 ...de-base-provider-required-to-load-ecparam.patch |  25 -
 app-crypt/tpm2-openssl/metadata.xml|  12 ---
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild   | 101 -
 4 files changed, 139 deletions(-)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
deleted file mode 100644
index 06860f3302..00
--- a/app-crypt/tpm2-openssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 5a55546286..00
--- 
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 
-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
deleted file mode 100644
index aa195a46b8..00
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   salah.coro...@gmail.com
-   Christopher Byrne
-   
-   
-   tpm2-software/tpm2-openssl
-   
-
-

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
deleted file mode 100644
index 1033293fb5..00
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 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"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
-   =dev-libs/openssl-3.0*:0="
-
-DEPEND="${RDEPEND}
-   test? ( app-crypt/swtpm
-   app-crypt/tpm2-abrmd
-   app-crypt/tpm2-tools )"
-
-BDEPEND="sys-devel/autoconf-archive
-virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-   
"${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch"
-   )
-
-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

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

2023-03-14 Thread Christopher Byrne 
commit: 111cabeae34e03a8d729ef287adc27ecb3d3b87f
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Mar 14 23:28:52 2023 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Tue Mar 14 23:28:52 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111cabea

app-crypt/tpm2-openssl: Fix failing test

Closes: https://bugs.gentoo.org/901005
Signed-off-by: Christopher Byrne  gmail.com>

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

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 0..5a5554628
--- /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 
+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
index cd1ce1c8a..aa195a46b 100644
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -5,4 +5,8 @@
salah.coro...@gmail.com
Christopher Byrne

+   
+   tpm2-software/tpm2-openssl
+   
 
+

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
index fff830dd8..1033293fb 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="sys-devel/autoconf-archive
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+   
"${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch"
+   )
+
 dbus_run() {
(
# start isolated dbus session bus

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-10-09 Thread Christopher Byrne 
commit: be634817a1fda3a9584482c6d11ff992742f
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Oct  9 21:39:55 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Sun Oct  9 21:42:50 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=be63

app-crypt/tpm2-openssl: drop 1.1.0

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/Manifest  |   1 -
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 112 ---
 2 files changed, 113 deletions(-)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 5bb40e0b3..06860f330 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,2 +1 @@
-DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B 
c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a
 SHA512 
a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b
 DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 
4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1
 SHA512 
be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
deleted file mode 100644
index 7ac127f02..0
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 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"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
-   =dev-libs/openssl-3.0*:0="
-
-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
-
-   sed -i \
-   "s/m4_esyscmd_s(\[git describe --tags --always --dirty\])/${PV}/" \
-   "${S}/configure.ac" || die
-   eautoreconf
-   default
-}
-
-src_install() {
-   default
-   find "${ED}" -iname \*.la -delete || die
-
-   # No libtool files are install, so nothing to check for bug #833887
-}
-
-src_test() {
-   dbus_run tpm2_run_with_emulator make check
-}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-10-09 Thread Christopher Byrne 
commit: 0ebc305f15be628f1f0c163c6c52796b6a0105b0
Author: Christopher Byrne  gmail  com>
AuthorDate: Sun Oct  9 21:39:37 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Sun Oct  9 21:42:48 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0ebc305f

app-crypt/tpm2-openssl: add 1.1.1

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/Manifest  |  1 +
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild | 97 
 2 files changed, 98 insertions(+)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index f6034158c..5bb40e0b3 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1 +1,2 @@
 DIST tpm2-openssl-1.1.0.tar.gz 415118 BLAKE2B 
c82410b1694b5db3e7b6614b1c4e2eef7354c87574334e1e81631bba707398e3d33d975dba2f2cbbf1b09d90f8ae94e7f01531c98b1efd666ca43298a02ead0a
 SHA512 
a57e25d8efcbaa3a898a2803d816169e4227466f9391e5dc7c80a44686865cae0c24ee1973c6376d86d5be8081850f7b35cd0d4cb0b3a8cf654d400d78ae383b
+DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 
4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1
 SHA512 
be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

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 0..fff830dd8
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 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"
+
+RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
+   =dev-libs/openssl-3.0*:0="
+
+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_install() {
+   default
+   find "${ED}" -iname \*.la -delete || die
+}
+
+src_test() {
+   dbus_run tpm2_run_with_emulator make check
+}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-09-28 Thread Christopher Byrne 
commit: ce5b974bb8de3f14c9902669998e6ad8eb8901cb
Author: Christopher Byrne  gmail  com>
AuthorDate: Wed Sep 28 15:45:53 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Wed Sep 28 15:45:53 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ce5b974b

app-crypt/tpm2-openssl: Add missing quoting

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 18 +-
 1 file changed, 9 insertions(+), 9 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 2cb119589..7ac127f02 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -43,13 +43,13 @@ dbus_run() {
 }
 
 tpm2_run_with_emulator() {
-   export XDG_CONFIG_HOME=${T}/.config/swtpm
+   export XDG_CONFIG_HOME="${T}/.config/swtpm"
"${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
 
-   mkdir -p ${XDG_CONFIG_HOME}/mytpm1 || die
+   mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
swtpm_setup_args=(
--tpm2
-   --tpmstate ${XDG_CONFIG_HOME}/mytpm1
+   --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
--createek
--allow-signing
--decryption
@@ -63,18 +63,18 @@ tpm2_run_with_emulator() {
 
swtpm_socket_args=(
--tpm2
-   --tpmstate dir=${XDG_CONFIG_HOME}/mytpm1
+   --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
+   --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
+   --tcti=swtpm:path="${XDG_CONFIG_HOME}/mytpm1/swtpm.socket"
--session
--flush-all
)
@@ -86,7 +86,7 @@ tpm2_run_with_emulator() {
$@ || die
 
# When swtpm dies, tmp2-abrmd will exit
-   kill $(< ${XDG_CONFIG_HOME}/mytpm1/swtpm.pid) || die
+   kill $(< "${XDG_CONFIG_HOME}/mytpm1/swtpm.pid") || die
 }
 
 src_prepare() {

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-09-27 Thread Christopher Byrne 
commit: f967da3dc0d646f757b7a7807ee89f7e0181dbc7
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Sep 27 22:05:33 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Tue Sep 27 22:09:12 2022 +
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
+}

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-09-08 Thread Andrew Ammerlaan 
commit: dcfe5c713c6d0e5972d11e22912d73185d378f00
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Thu Sep  8 09:53:41 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Thu Sep  8 09:53:41 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=dcfe5c71

app-crypt/tpm2-openssl: quote ED variable

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 10a17e8b5..bce9e94a4 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -38,7 +38,7 @@ src_prepare() {
 
 src_install() {
default
-   find ${ED} -iname \*.la -delete || die
+   find "${ED}" -iname \*.la -delete || die
 
# No libtool files are install, so nothing to check for bug #833887
 }

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-06-05 Thread Alessandro Barbieri 
commit: 6a94180f12c7651130ca3e57273a399673f17a63
Author: Alessandro Barbieri  gmail  com>
AuthorDate: Sun Jun  5 21:12:41 2022 +
Commit: Alessandro Barbieri  gmail  com>
CommitDate: Sun Jun  5 21:12:41 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=6a94180f

app-crypt/tpm2-openssl: update maintainers

Signed-off-by: Alessandro Barbieri  gmail.com>

 app-crypt/tpm2-openssl/metadata.xml | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app-crypt/tpm2-openssl/metadata.xml 
b/app-crypt/tpm2-openssl/metadata.xml
index fdd29c016..cd1ce1c8a 100644
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -1,12 +1,8 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
salah.coro...@gmail.com
Christopher Byrne

-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-04-16 Thread Christopher Byrne 
commit: 3792ef163b7f88687cbcdb0a28432ba152cf7c3b
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 16 17:57:33 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Sat Apr 16 17:59:49 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3792ef16

app-crypt/tpm2-openssl: Add missing DEPEND="${RDEPEND}"

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 2 ++
 1 file changed, 2 insertions(+)

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 036fbb971..10a17e8b5 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -20,6 +20,8 @@ RESTRICT="test"
 RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
=dev-libs/openssl-3.0*:0="
 
+DEPEND="${RDEPEND}"
+
 BDEPEND="sys-devel/autoconf-archive
 virtual/pkgconfig"

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/

2022-04-15 Thread Christopher Byrne 
commit: 63290304faf483c3b020e115ef76162a9f9c29bf
Author: Christopher Byrne  gmail  com>
AuthorDate: Sat Apr 16 00:45:34 2022 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Sat Apr 16 00:47:40 2022 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=63290304

app-crypt/tpm2-openssl: Add missing || die to find

Signed-off-by: Christopher Byrne  gmail.com>

 app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 ac786eeec..036fbb971 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.0.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
 
 src_install() {
default
-   find ${ED} -iname \*.la -delete
+   find ${ED} -iname \*.la -delete || die
 
# No libtool files are install, so nothing to check for bug #833887
 }