| 1 |
commit: f2e06ef88010e65b016a47d9086e12a206114c2f |
| 2 |
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com> |
| 3 |
AuthorDate: Thu Oct 1 17:46:05 2020 +0000 |
| 4 |
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 1 17:46:24 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2e06ef8 |
| 7 |
|
| 8 |
net-misc/openssh-8.4_p1: port libressl patch for hpn (bug #745912) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/745912 |
| 11 |
Copyright: Sony Interactive Entertainment Inc. |
| 12 |
Package-Manager: Portage-3.0.8, Repoman-3.0.1 |
| 13 |
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/openssh-8.4_p1-hpn-14.22-libressl.patch | 20 ++++++++++++++++++++ |
| 16 |
net-misc/openssh/openssh-8.4_p1.ebuild | 1 + |
| 17 |
2 files changed, 21 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..79cc3e5c2d8 |
| 22 |
--- /dev/null |
| 23 |
+++ b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch |
| 24 |
@@ -0,0 +1,20 @@ |
| 25 |
+--- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:31:37.392120799 -0700 |
| 26 |
++++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:32:46.143684424 -0700 |
| 27 |
+@@ -672,7 +672,7 @@ |
| 28 |
+ +const EVP_CIPHER * |
| 29 |
+ +evp_aes_ctr_mt(void) |
| 30 |
+ +{ |
| 31 |
+-+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL |
| 32 |
+++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER) |
| 33 |
+ + static EVP_CIPHER *aes_ctr; |
| 34 |
+ + aes_ctr = EVP_CIPHER_meth_new(NID_undef, 16/*block*/, 16/*key*/); |
| 35 |
+ + EVP_CIPHER_meth_set_iv_length(aes_ctr, AES_BLOCK_SIZE); |
| 36 |
+@@ -701,7 +701,7 @@ |
| 37 |
+ + EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; |
| 38 |
+ +# endif /*SSH_OLD_EVP*/ |
| 39 |
+ + return &aes_ctr; |
| 40 |
+-+# endif /*OPENSSH_VERSION_NUMBER*/ |
| 41 |
+++# endif /*OPENSSL_VERSION_NUMBER*/ |
| 42 |
+ +} |
| 43 |
+ + |
| 44 |
+ +#endif /* defined(WITH_OPENSSL) */ |
| 45 |
|
| 46 |
diff --git a/net-misc/openssh/openssh-8.4_p1.ebuild b/net-misc/openssh/openssh-8.4_p1.ebuild |
| 47 |
index 04544b8f1fd..6248805da22 100644 |
| 48 |
--- a/net-misc/openssh/openssh-8.4_p1.ebuild |
| 49 |
+++ b/net-misc/openssh/openssh-8.4_p1.ebuild |
| 50 |
@@ -188,6 +188,7 @@ src_prepare() { |
| 51 |
cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die |
| 52 |
pushd "${hpn_patchdir}" &>/dev/null || die |
| 53 |
eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch |
| 54 |
+ eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-libressl.patch |
| 55 |
if use X509; then |
| 56 |
# einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" |
| 57 |
# # X509 and AES-CTR-MT don't get along, let's just drop it |
Archives