1 |
commit: 70eb828dffade884a4617f44f799b809b2e82c6f |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 3 18:34:06 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 3 18:45:42 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70eb828d |
7 |
|
8 |
app-crypt/tpm2-tools: drop obsolete LibreSSL patch |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
.../files/tpm2-tools-4.3.0-libressl.patch | 26 --------------- |
13 |
.../tpm2-tools/files/tpm2-tools-5.0-libressl.patch | 39 ---------------------- |
14 |
2 files changed, 65 deletions(-) |
15 |
|
16 |
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch |
17 |
deleted file mode 100644 |
18 |
index 88948546353..00000000000 |
19 |
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch |
20 |
+++ /dev/null |
21 |
@@ -1,26 +0,0 @@ |
22 |
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c |
23 |
-index a3b0e387..9519ca7b 100644 |
24 |
---- a/lib/tpm2_identity_util.c |
25 |
-+++ b/lib/tpm2_identity_util.c |
26 |
-@@ -17,7 +17,7 @@ |
27 |
- |
28 |
- // Identity-related functionality that the TPM normally does, but using OpenSSL |
29 |
- |
30 |
--#if defined(LIBRESSL_VERSION_NUMBER) |
31 |
-+#if 0 |
32 |
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, |
33 |
- const unsigned char *from, int flen, const unsigned char *param, int plen, |
34 |
- const EVP_MD *md, const EVP_MD *mgf1md) { |
35 |
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c |
36 |
-index 6d29c0d4..bd375ce3 100644 |
37 |
---- a/lib/tpm2_openssl.c |
38 |
-+++ b/lib/tpm2_openssl.c |
39 |
-@@ -14,7 +14,7 @@ |
40 |
- #include "tpm2_openssl.h" |
41 |
- |
42 |
- /* compatibility function for OpenSSL versions < 1.1.0 */ |
43 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
44 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
45 |
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) { |
46 |
- int r; |
47 |
- int topad; |
48 |
|
49 |
diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch b/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch |
50 |
deleted file mode 100644 |
51 |
index b41c9f50e27..00000000000 |
52 |
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch |
53 |
+++ /dev/null |
54 |
@@ -1,39 +0,0 @@ |
55 |
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c |
56 |
-index a3b0e387..9519ca7b 100644 |
57 |
---- a/lib/tpm2_identity_util.c |
58 |
-+++ b/lib/tpm2_identity_util.c |
59 |
-@@ -17,7 +17,7 @@ |
60 |
- |
61 |
- // Identity-related functionality that the TPM normally does, but using OpenSSL |
62 |
- |
63 |
--#if defined(LIBRESSL_VERSION_NUMBER) |
64 |
-+#if 0 |
65 |
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen, |
66 |
- const unsigned char *from, int flen, const unsigned char *param, int plen, |
67 |
- const EVP_MD *md, const EVP_MD *mgf1md) { |
68 |
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c |
69 |
-index e769d6df..54f124c9 100644 |
70 |
---- a/lib/tpm2_openssl.c |
71 |
-+++ b/lib/tpm2_openssl.c |
72 |
-@@ -15,7 +15,7 @@ |
73 |
- #include "tpm2_systemdeps.h" |
74 |
- |
75 |
- /* compatibility function for OpenSSL versions < 1.1.0 */ |
76 |
--#if OPENSSL_VERSION_NUMBER < 0x10100000L |
77 |
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) |
78 |
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) { |
79 |
- int r; |
80 |
- int topad; |
81 |
-diff --git a/lib/tpm2_openssl.h b/lib/tpm2_openssl.h |
82 |
-index 46c8f9c0..71206309 100644 |
83 |
---- a/lib/tpm2_openssl.h |
84 |
-+++ b/lib/tpm2_openssl.h |
85 |
-@@ -17,7 +17,7 @@ |
86 |
- #define LIB_TPM2_OPENSSL_OPENSSL_PRE11 |
87 |
- #endif |
88 |
- |
89 |
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L |
90 |
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER) |
91 |
- #define EC_POINT_set_affine_coordinates_tss(group, tpm_pub_key, bn_x, bn_y, dmy) \ |
92 |
- EC_POINT_set_affine_coordinates(group, tpm_pub_key, bn_x, bn_y, dmy) |
93 |
- |