From: Patrick McLean <patrick.mclean@sony.com>
Date: Fri, 17 Apr 2020 18:01:37 +0000 (-0700)
Subject: net-misc/openssh-8.2_p1-r6: Fix libressl patch for openssl-1.1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ddb17b3e84ce379d60d2cb5c0ab4774bdb468d6c;p=gentoo.git

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 <chutzpah@gentoo.org>
---

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 31796e754a1d..aa6eea44107e 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) */