Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/files/
Date: Mon, 03 May 2021 11:28:56
Message-Id: 1620041321.ebccfebd1e9a5999357933ffda08b3e11fce375a.zlogene@gentoo
1 commit: ebccfebd1e9a5999357933ffda08b3e11fce375a
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Sun May 2 11:55:23 2021 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Mon May 3 11:28:41 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebccfebd
7
8 net-misc/openssh: remove unused patch
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
12 Closes: https://github.com/gentoo/gentoo/pull/20653
13 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
14
15 .../files/openssh-8.4_p1-hpn-14.22-libressl.patch | 20 --------------------
16 1 file changed, 20 deletions(-)
17
18 diff --git a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch
19 deleted file mode 100644
20 index 79cc3e5c2d8..00000000000
21 --- a/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch
22 +++ /dev/null
23 @@ -1,20 +0,0 @@
24 ---- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:31:37.392120799 -0700
25 -+++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:32:46.143684424 -0700
26 -@@ -672,7 +672,7 @@
27 - +const EVP_CIPHER *
28 - +evp_aes_ctr_mt(void)
29 - +{
30 --+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL
31 -++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER)
32 - + static EVP_CIPHER *aes_ctr;
33 - + aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/);
34 - + EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE);
35 -@@ -701,7 +701,7 @@
36 - + EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;
37 - +# endif /*SSH_OLD_EVP*/
38 - + return &aes_ctr;
39 --+# endif /*OPENSSH_VERSION_NUMBER*/
40 -++# endif /*OPENSSL_VERSION_NUMBER*/
41 - +}
42 - +
43 - +#endif /* defined(WITH_OPENSSL) */