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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8D61915806E for ; Wed, 7 Jun 2023 16:19:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAB95E087E; Wed, 7 Jun 2023 16:19:27 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93C21E087E for ; Wed, 7 Jun 2023 16:19:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B6EDB340DB8 for ; Wed, 7 Jun 2023 16:19:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51868A53 for ; Wed, 7 Jun 2023 16:19:25 +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: <1686154750.3892b973f9dabb5a5f0cd304d96475223ccbc34d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tor/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tor/files/tor-0.4.7.13-libressl.patch X-VCS-Directories: net-vpn/tor/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3892b973f9dabb5a5f0cd304d96475223ccbc34d X-VCS-Branch: master Date: Wed, 7 Jun 2023 16:19:25 +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: b8364d5f-ed34-4381-9bbc-45785a0d5f63 X-Archives-Hash: bff5350d8f48d3d9ceb5b03c7d6551d9 commit: 3892b973f9dabb5a5f0cd304d96475223ccbc34d Author: orbea riseup net> AuthorDate: Wed May 31 14:16:46 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jun 7 16:19:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3892b973 net-vpn/tor: update upstream libressl patch With LibreSSL 3.8.0 some functions which have been deprecated in OpenSSL 3.0 were removed for security reasons. This patch which was accepted upstream by Tor disables some code that uses one of these functions with the newer LibreSSL 3.8.0 version. Bug: https://bugs.gentoo.org/903001 Upstream-PR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/713 Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/9850dc59c0db5cbcadc314be8d324a992880fce1 Signed-off-by: orbea riseup.net> Closes: https://github.com/gentoo/gentoo/pull/31245 Signed-off-by: Sam James gentoo.org> net-vpn/tor/files/tor-0.4.7.13-libressl.patch | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/net-vpn/tor/files/tor-0.4.7.13-libressl.patch b/net-vpn/tor/files/tor-0.4.7.13-libressl.patch index 76d52fd1c54e..bba0c45f3fc3 100644 --- a/net-vpn/tor/files/tor-0.4.7.13-libressl.patch +++ b/net-vpn/tor/files/tor-0.4.7.13-libressl.patch @@ -1,5 +1,7 @@ Upstream-MR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/598 Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/da52d7206a4a8e4fa8b5e80b5ed73de50fbe8692 +Upstream-MR: https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/713 +Upstream-Commit: https://gitlab.torproject.org/tpo/core/tor/-/commit/9850dc59c0db5cbcadc314be8d324a992880fce1 From f3dabd705f26c56076934323f24b5b05ecdfd39c Mon Sep 17 00:00:00 2001 From: "Alex Xu (Hello71)" @@ -159,3 +161,42 @@ index 0000000000..faf04941b6 -- GitLab +From 9850dc59c0db5cbcadc314be8d324a992880fce1 Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 29 May 2023 12:56:37 -0700 +Subject: [PATCH] tls: Disable a warning with LibreSSL >= 3.8.0 + +Skip a warning using EC_GFp_nist_method() which was removed in LibreSSL +3.8. + +Based on a patch from OpenBSD. + +https://github.com/openbsd/ports/commit/33fe251a08cb11f30ce6094a2e0759c3bb63ed16 + +These functions are deprecated since OpenSSL 3.0. + +https://www.openssl.org/docs/man3.1/man3/EC_GFp_nist_method.html +--- + src/lib/tls/tortls_openssl.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c +index 12260c09d3..c0a89ac272 100644 +--- a/src/lib/tls/tortls_openssl.c ++++ b/src/lib/tls/tortls_openssl.c +@@ -340,8 +340,10 @@ tor_tls_init(void) + SSL_load_error_strings(); + #endif /* defined(OPENSSL_1_1_API) */ + +-#if (SIZEOF_VOID_P >= 8 && \ +- OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1)) ++#if (SIZEOF_VOID_P >= 8 && \ ++ OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,1) && \ ++ (!defined(LIBRESSL_VERSION_NUMBER) || \ ++ LIBRESSL_VERSION_NUMBER < 0x3080000fL)) + long version = tor_OpenSSL_version_num(); + + /* LCOV_EXCL_START : we can't test these lines on the same machine */ +-- +GitLab +