From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 794FA1382C5 for ; Mon, 3 May 2021 18:46:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DFBCE08EB; Mon, 3 May 2021 18:46:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86CF4E08D3 for ; Mon, 3 May 2021 18:46:37 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D492340B1E for ; Mon, 3 May 2021 18:46:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 852B775F for ; Mon, 3 May 2021 18:46:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1620067542.70eb828dffade884a4617f44f799b809b2e82c6f.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-tools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/tpm2-tools/files/tpm2-tools-4.3.0-libressl.patch app-crypt/tpm2-tools/files/tpm2-tools-5.0-libressl.patch X-VCS-Directories: app-crypt/tpm2-tools/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 70eb828dffade884a4617f44f799b809b2e82c6f X-VCS-Branch: master Date: Mon, 3 May 2021 18:46:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c1f4208f-2143-486e-8dc9-29f42bd84798 X-Archives-Hash: dd11e7ecf4be91308bb261b48318e5c1 commit: 70eb828dffade884a4617f44f799b809b2e82c6f Author: Sam James gentoo org> AuthorDate: Mon May 3 18:34:06 2021 +0000 Commit: Sam James gentoo 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 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) -