1 |
commit: 111cabeae34e03a8d729ef287adc27ecb3d3b87f |
2 |
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Mar 14 23:28:52 2023 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 14 23:28:52 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111cabea |
7 |
|
8 |
app-crypt/tpm2-openssl: Fix failing test |
9 |
|
10 |
Closes: https://bugs.gentoo.org/901005 |
11 |
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com> |
12 |
|
13 |
...de-base-provider-required-to-load-ecparam.patch | 25 ++++++++++++++++++++++ |
14 |
app-crypt/tpm2-openssl/metadata.xml | 4 ++++ |
15 |
app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild | 4 ++++ |
16 |
3 files changed, 33 insertions(+) |
17 |
|
18 |
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 |
19 |
new file mode 100644 |
20 |
index 000000000..5a5554628 |
21 |
--- /dev/null |
22 |
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch |
23 |
@@ -0,0 +1,25 @@ |
24 |
+From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001 |
25 |
+From: Petr Gotthard <petr.gotthard@×××××××××.cz> |
26 |
+Date: Fri, 23 Dec 2022 10:46:40 +0100 |
27 |
+Subject: [PATCH] tests: include base provider required to load ecparam |
28 |
+ |
29 |
+--- |
30 |
+ test/ec_genpkey_parameters.sh | 2 +- |
31 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
32 |
+ |
33 |
+diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh |
34 |
+index 406b558..a4f68d7 100755 |
35 |
+--- a/test/ec_genpkey_parameters.sh |
36 |
++++ b/test/ec_genpkey_parameters.sh |
37 |
+@@ -6,7 +6,7 @@ set -eufx |
38 |
+ openssl ecparam -name prime256v1 -out testparam.pem |
39 |
+ |
40 |
+ # generate private key as PEM |
41 |
+-openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem |
42 |
++openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out testkey.pem |
43 |
+ |
44 |
+ # display private key info |
45 |
+ openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout |
46 |
+-- |
47 |
+2.39.2 |
48 |
+ |
49 |
|
50 |
diff --git a/app-crypt/tpm2-openssl/metadata.xml b/app-crypt/tpm2-openssl/metadata.xml |
51 |
index cd1ce1c8a..aa195a46b 100644 |
52 |
--- a/app-crypt/tpm2-openssl/metadata.xml |
53 |
+++ b/app-crypt/tpm2-openssl/metadata.xml |
54 |
@@ -5,4 +5,8 @@ |
55 |
<email>salah.coronya@×××××.com</email> |
56 |
<name>Christopher Byrne</name> |
57 |
</maintainer> |
58 |
+ <upstream> |
59 |
+ <remote-id type="github">tpm2-software/tpm2-openssl</remote-id> |
60 |
+ </upstream> |
61 |
</pkgmetadata> |
62 |
+ |
63 |
|
64 |
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild |
65 |
index fff830dd8..1033293fb 100644 |
66 |
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild |
67 |
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild |
68 |
@@ -26,6 +26,10 @@ BDEPEND="sys-devel/autoconf-archive |
69 |
|
70 |
RESTRICT="!test? ( test )" |
71 |
|
72 |
+PATCHES=( |
73 |
+ "${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch" |
74 |
+ ) |
75 |
+ |
76 |
dbus_run() { |
77 |
( |
78 |
# start isolated dbus session bus |