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 3E499158009 for ; Wed, 21 Jun 2023 15:35:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B3566E095C; Wed, 21 Jun 2023 15:35:35 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93806E095C for ; Wed, 21 Jun 2023 15:35:35 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21386340B35 for ; Wed, 21 Jun 2023 15:35:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46EFFA66 for ; Wed, 21 Jun 2023 15:35:32 +0000 (UTC) From: "orbea" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "orbea" Message-ID: <1687353571.02be6afe98da744f31bd3bb184ee2d47737e39b6.orbea@gentoo> Subject: [gentoo-commits] repo/proj/libressl:master commit in: dev-perl/Net-SSLeay/, dev-perl/Net-SSLeay/files/ X-VCS-Repository: repo/proj/libressl X-VCS-Files: dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch X-VCS-Directories: dev-perl/Net-SSLeay/files/ dev-perl/Net-SSLeay/ X-VCS-Committer: orbea X-VCS-Committer-Name: orbea X-VCS-Revision: 02be6afe98da744f31bd3bb184ee2d47737e39b6 X-VCS-Branch: master Date: Wed, 21 Jun 2023 15:35:32 +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: 437373df-3e0a-432b-92d8-0e6af61b3d22 X-Archives-Hash: 90cf30a9ef4eacd0fda4013f92729a84 commit: 02be6afe98da744f31bd3bb184ee2d47737e39b6 Author: orbea riseup net> AuthorDate: Wed Jun 21 13:19:31 2023 +0000 Commit: orbea riseup net> CommitDate: Wed Jun 21 13:19:31 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=02be6afe dev-perl/Net-SSLeay: use gentoo libressl patch Signed-off-by: orbea riseup.net> dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild | 1 - .../files/Net-SSLeay-1.92-libressl.patch | 45 ++++++++++++++++++---- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild index 9ee02cd..c66c67f 100644 --- a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild +++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild @@ -36,7 +36,6 @@ BDEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-1.88-fix-network-tests.patch" "${FILESDIR}/${PN}-1.92-libressl.patch" #903001 - "${FILESDIR}/${PN}-1.92-libressl-3.8.0.patch" ) PERL_RM_FILES=( diff --git a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch index 380fd15..f3e1b4a 100644 --- a/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch +++ b/dev-perl/Net-SSLeay/files/Net-SSLeay-1.92-libressl.patch @@ -5,6 +5,9 @@ https://github.com/radiator-software/p5-net-ssleay/pull/362 https://github.com/radiator-software/p5-net-ssleay/commit/88c3bbc45399c8ef2c8879aada8bfa91d8bc6c10 https://github.com/radiator-software/p5-net-ssleay/pull/363 https://github.com/radiator-software/p5-net-ssleay/commit/3dd2f101b8e15a59f66e22525b8d001d5ad6ce7d +https://github.com/radiator-software/p5-net-ssleay/pull/434 +https://github.com/radiator-software/p5-net-ssleay/pull/435 +https://github.com/radiator-software/p5-net-ssleay/commit/fe9e49d220fa424c55fc436303b24f5bddae0b8d From 4a886e06c1cac80e7fb3f8d52146a27ce557ba8c Mon Sep 17 00:00:00 2001 From: Alexander Bluhm @@ -46,14 +49,24 @@ Use RSA_get0... functions to provide RSA_get_key_parameters(). SSLeay.xs | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) -diff --git a/SSLeay.xs b/SSLeay.xs -index b0667e2..58f1716 100644 +From fe9e49d220fa424c55fc436303b24f5bddae0b8d Mon Sep 17 00:00:00 2001 +From: orbea +Date: Mon, 29 May 2023 10:16:33 -0700 +Subject: [PATCH] SSLeay.xs: Disable Policy Tree API for LibreSSL 3.8 and later + +This is taken from the OpenBSD ports tree. + +https://github.com/openbsd/ports/commit/f6567f938c9bd51bfd99f8426eba6a1590cc6384 +--- + SSLeay.xs | 2 ++ + 1 file changed, 2 insertions(+) + --- a/SSLeay.xs +++ b/SSLeay.xs @@ -1914,7 +1914,7 @@ X509 * find_issuer(X509 *cert,X509_STORE *store, STACK_OF(X509) *chain) { return issuer; } - + -SV* bn2sv(BIGNUM* p_bn) +SV* bn2sv(const BIGNUM* p_bn) { @@ -94,13 +107,29 @@ index b0667e2..58f1716 100644 XPUSHs(bn2sv(rsa->iqmp)); +#endif } - + -#endif +#endif /* OpenSSL < 1.1 or LibreSSL */ - + void RSA_free(r) -@@ -7197,7 +7218,7 @@ ASN1_OBJECT * +@@ -7010,6 +7031,7 @@ X509_VERIFY_PARAM_get0_peername(param) + + #endif /* OpenSSL 1.0.2-beta2, LibreSSL 2.7.0 */ + ++#if !defined(LIBRESSL_VERSION_NUMBER) || (LIBRESSL_VERSION_NUMBER < 0x3080000fL) /* LibreSSL < 3.8.0 */ + void + X509_policy_tree_free(tree) + X509_POLICY_TREE *tree +@@ -7052,6 +7074,7 @@ const X509_POLICY_NODE * + X509_policy_node_get0_parent(node) + const X509_POLICY_NODE *node + ++#endif /* !(LibreSSL >= 3.7.0) */ + #endif + + ASN1_OBJECT * +@@ -7197,7 +7220,7 @@ ASN1_OBJECT * P_X509_get_signature_alg(x) X509 * x CODE: @@ -109,7 +138,7 @@ index b0667e2..58f1716 100644 RETVAL = (X509_get0_tbs_sigalg(x)->algorithm); #else RETVAL = (x->cert_info->signature->algorithm); -@@ -7690,7 +7711,7 @@ OCSP_response_results(rsp,...) +@@ -7690,7 +7713,7 @@ OCSP_response_results(rsp,...) if (!idsv) { /* getall: create new SV with OCSP_CERTID */ unsigned char *pi,*pc; @@ -118,7 +147,7 @@ index b0667e2..58f1716 100644 int len = i2d_OCSP_CERTID((OCSP_CERTID *)OCSP_SINGLERESP_get0_id(sir),NULL); #else int len = i2d_OCSP_CERTID(sir->certId,NULL); -@@ -7699,7 +7720,7 @@ OCSP_response_results(rsp,...) +@@ -7699,7 +7722,7 @@ OCSP_response_results(rsp,...) Newx(pc,len,unsigned char); if (!pc) croak("out of memory"); pi = pc;