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

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

[Sam James]

commit:     70eb828dffade884a4617f44f799b809b2e82c6f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 18:34:06 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  3 18:45:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70eb828d

app-crypt/tpm2-tools: drop obsolete LibreSSL patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/tpm2-tools-4.3.0-libressl.patch          | 26 ---------------
 .../tpm2-tools/files/tpm2-tools-5.0-libressl.patch | 39 ----------------------
 2 files changed, 65 deletions(-)

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
deleted file mode 100644
index 88948546353..00000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
---- a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-         const unsigned char *from, int flen, const unsigned char *param, int plen,
-         const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index 6d29c0d4..bd375ce3 100644
---- a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -14,7 +14,7 @@
- #include "tpm2_openssl.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
-     int r;
-     int topad;

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
deleted file mode 100644
index b41c9f50e27..00000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/lib/tpm2_identity_util.c b/lib/tpm2_identity_util.c
-index a3b0e387..9519ca7b 100644
---- a/lib/tpm2_identity_util.c
-+++ b/lib/tpm2_identity_util.c
-@@ -17,7 +17,7 @@
- 
- // Identity-related functionality that the TPM normally does, but using OpenSSL
- 
--#if defined(LIBRESSL_VERSION_NUMBER)
-+#if 0
- static int RSA_padding_add_PKCS1_OAEP_mgf1(unsigned char *to, int tlen,
-         const unsigned char *from, int flen, const unsigned char *param, int plen,
-         const EVP_MD *md, const EVP_MD *mgf1md) {
-diff --git a/lib/tpm2_openssl.c b/lib/tpm2_openssl.c
-index e769d6df..54f124c9 100644
---- a/lib/tpm2_openssl.c
-+++ b/lib/tpm2_openssl.c
-@@ -15,7 +15,7 @@
- #include "tpm2_systemdeps.h"
- 
- /* compatibility function for OpenSSL versions < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
- static int BN_bn2binpad(const BIGNUM *a, unsigned char *to, int tolen) {
-     int r;
-     int topad;
-diff --git a/lib/tpm2_openssl.h b/lib/tpm2_openssl.h
-index 46c8f9c0..71206309 100644
---- a/lib/tpm2_openssl.h
-+++ b/lib/tpm2_openssl.h
-@@ -17,7 +17,7 @@
- #define LIB_TPM2_OPENSSL_OPENSSL_PRE11
- #endif
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10101000L
-+#if (OPENSSL_VERSION_NUMBER >= 0x10101000L) && !defined(LIBRESSL_VERSION_NUMBER)
- #define EC_POINT_set_affine_coordinates_tss(group, tpm_pub_key, bn_x, bn_y, dmy) \
-         EC_POINT_set_affine_coordinates(group, tpm_pub_key, bn_x, bn_y, dmy)
- 

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

[Conrad Kostecki]

commit:     2d873558e87b56979247b45be401aab18f19e60c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Apr 25 17:46:50 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 21:45:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d873558

app-crypt/tpm2-tools: remove unused patch

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch    | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch b/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
deleted file mode 100644
index caa3fac23bf4..000000000000
--- a/app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-Remove-WError.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 7b5c2196..d07d5433 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -210,7 +210,6 @@ AS_IF([test x"$enable_hardening" != x"no"], [
- 
-   add_hardened_c_flag([-Wall])
-   add_hardened_c_flag([-Wextra])
--  add_hardened_c_flag([-Werror])
- 
-   add_hardened_c_flag([-Wformat])
-   add_hardened_c_flag([-Wformat-security])