From: Darren Tucker <dtucker@dtucker.net>
Date: Mon, 6 Apr 2020 10:54:34 +0000 (+1000)
Subject: Include openssl-compat.h before checking ifdefs.
X-Git-Tag: V_8_3_P1~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8461a5b3db34ed0b5a4a18d82f64fd5ac8693ea8;p=thirdparty%2Fopenssh-portable.git

Include openssl-compat.h before checking ifdefs.

Fixes problem where unsuitable chacha20 code in libressl would be used
unintentionally.
---

diff --git a/cipher-chachapoly-libcrypto.c b/cipher-chachapoly-libcrypto.c
index 2c0f80f28..76c24dcba 100644
--- a/cipher-chachapoly-libcrypto.c
+++ b/cipher-chachapoly-libcrypto.c
@@ -17,6 +17,9 @@
 /* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.1 2020/04/03 04:32:21 djm Exp $ */
 
 #include "includes.h"
+#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
+#endif
 
 #if defined(HAVE_EVP_CHACHA20) || !defined(HAVE_BROKEN_CHACHA20)
 
diff --git a/cipher-chachapoly.c b/cipher-chachapoly.c
index 132cdeec9..716f8d426 100644
--- a/cipher-chachapoly.c
+++ b/cipher-chachapoly.c
@@ -17,6 +17,9 @@
 /* $OpenBSD: cipher-chachapoly.c,v 1.9 2020/04/03 04:27:03 djm Exp $ */
 
 #include "includes.h"
+#ifdef WITH_OPENSSL
+#include "openbsd-compat/openssl-compat.h"
+#endif
 
 #if !defined(HAVE_EVP_CHACHA20) || defined(HAVE_BROKEN_CHACHA20)