From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 30 Apr 2020 23:21:52 +0000 (+1000)
Subject: Fix conditional for openssl-based chacha20.
X-Git-Tag: V_8_3_P1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d27cba58c972d101a5de976777e518f34ac779cb;p=thirdparty%2Fopenssh-portable.git

Fix conditional for openssl-based chacha20.

Fixes warnings or link errors when building against older OpenSSLs.
ok djm
---

diff --git a/cipher-chachapoly-libcrypto.c b/cipher-chachapoly-libcrypto.c
index 76c24dcba..719f9c843 100644
--- a/cipher-chachapoly-libcrypto.c
+++ b/cipher-chachapoly-libcrypto.c
@@ -21,7 +21,7 @@
 #include "openbsd-compat/openssl-compat.h"
 #endif
 
-#if defined(HAVE_EVP_CHACHA20) || !defined(HAVE_BROKEN_CHACHA20)
+#if defined(HAVE_EVP_CHACHA20) && !defined(HAVE_BROKEN_CHACHA20)
 
 #include <sys/types.h>
 #include <stdarg.h> /* needed for log.h */