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 46A4E138350 for ; Fri, 17 Apr 2020 18:01:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6F3E8E08E8; Fri, 17 Apr 2020 18:01:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 58271E08E8 for ; Fri, 17 Apr 2020 18:01:49 +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 3E61A34F181 for ; Fri, 17 Apr 2020 18:01:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 382DE71 for ; Fri, 17 Apr 2020 18:01:46 +0000 (UTC) From: "Patrick McLean" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrick McLean" Message-ID: <1587146497.ddb17b3e84ce379d60d2cb5c0ab4774bdb468d6c.chutzpah@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch X-VCS-Directories: net-misc/openssh/files/ X-VCS-Committer: chutzpah X-VCS-Committer-Name: Patrick McLean X-VCS-Revision: ddb17b3e84ce379d60d2cb5c0ab4774bdb468d6c X-VCS-Branch: master Date: Fri, 17 Apr 2020 18:01:46 +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: 63a8c1dc-e8c6-461b-829c-745b6af614a8 X-Archives-Hash: e4f45e8881c1fd135d3cd02a581d07e9 commit: ddb17b3e84ce379d60d2cb5c0ab4774bdb468d6c Author: Patrick McLean sony com> AuthorDate: Fri Apr 17 18:01:37 2020 +0000 Commit: Patrick McLean gentoo org> CommitDate: Fri Apr 17 18:01:37 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ddb17b3e net-misc/openssh-8.2_p1-r6: Fix libressl patch for openssl-1.1 Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Patrick McLean gentoo.org> net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch index 31796e754a1..aa6eea44107 100644 --- a/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch +++ b/net-misc/openssh/files/openssh-8.2_p1-hpn-14.20-libressl.patch @@ -5,7 +5,7 @@ +evp_aes_ctr_mt(void) +{ -+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL -++# ifdef HAVE_OPAQUE_STRUCTS +++# if OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS) + static EVP_CIPHER *aes_ctr; + aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/); + EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE); @@ -14,7 +14,7 @@ +# endif /*SSH_OLD_EVP*/ + return &aes_ctr; -+# endif /*OPENSSH_VERSION_NUMBER*/ -++# endif /*HAVE_OPAQUE_STRUCTS*/ +++# endif /*OPENSSL_VERSION_NUMBER*/ +} + +#endif /* defined(WITH_OPENSSL) */