diff options
| author |   Patrick McLean <patrick.mclean@sony.com> | 2020-10-01 10:46:05 -0700 |
|---|---|---|
| committer |   Patrick McLean <chutzpah@gentoo.org> | 2020-10-01 10:46:24 -0700 |
| commit | f2e06ef88010e65b016a47d9086e12a206114c2f (patch) | |
| tree | 80e2308dc0fcb2622e6e66e72962996fc283ce85 /net-misc | |
| parent | dev-libs/nss: stable 3.56 for sparc, bug #745795 (diff) | |
| download | gentoo-f2e06ef88010e65b016a47d9086e12a206114c2f.tar.gz gentoo-f2e06ef88010e65b016a47d9086e12a206114c2f.tar.bz2 gentoo-f2e06ef88010e65b016a47d9086e12a206114c2f.zip | |
net-misc/openssh-8.4_p1: port libressl patch for hpn (bug #745912)
Closes: https://bugs.gentoo.org/745912
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch | 20 | ||||
| -rw-r--r-- | net-misc/openssh/openssh-8.4_p1.ebuild | 1 |
2 files changed, 21 insertions, 0 deletions
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 new file mode 100644 index 000000000000..79cc3e5c2d81 --- /dev/null +++ b/net-misc/openssh/files/openssh-8.4_p1-hpn-14.22-libressl.patch @@ -0,0 +1,20 @@ +--- a/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:31:37.392120799 -0700 ++++ b/openssh-8_3_P1-hpn-AES-CTR-14.22.diff 2020-04-17 10:32:46.143684424 -0700 +@@ -672,7 +672,7 @@ + +const EVP_CIPHER * + +evp_aes_ctr_mt(void) + +{ +-+# if OPENSSL_VERSION_NUMBER >= 0x10100000UL +++# if (OPENSSL_VERSION_NUMBER >= 0x10100000UL || defined(HAVE_OPAQUE_STRUCTS)) && !defined(LIBRESSL_VERSION_NUMBER) + + 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); +@@ -701,7 +701,7 @@ + + EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; + +# endif /*SSH_OLD_EVP*/ + + return &aes_ctr; +-+# endif /*OPENSSH_VERSION_NUMBER*/ +++# endif /*OPENSSL_VERSION_NUMBER*/ + +} + + + +#endif /* defined(WITH_OPENSSL) */ diff --git a/net-misc/openssh/openssh-8.4_p1.ebuild b/net-misc/openssh/openssh-8.4_p1.ebuild index 04544b8f1fd8..6248805da228 100644 --- a/net-misc/openssh/openssh-8.4_p1.ebuild +++ b/net-misc/openssh/openssh-8.4_p1.ebuild @@ -188,6 +188,7 @@ src_prepare() { cp $(printf -- "${DISTDIR}/%s\n" "${HPN_PATCHES[@]}") "${hpn_patchdir}" || die pushd "${hpn_patchdir}" &>/dev/null || die eapply "${FILESDIR}"/${P}-hpn-${HPN_VER}-glue.patch + eapply "${FILESDIR}"/${PN}-8.4_p1-hpn-${HPN_VER}-libressl.patch if use X509; then # einfo "Will disable MT AES cipher due to incompatbility caused by X509 patch set" # # X509 and AES-CTR-MT don't get along, let's just drop it |