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 2c0f80f28ac2f2dbd1bc5d0d17f464391740a369..76c24dcbac068a1011bed447666954b88816b4a6 100644 (file)
--- 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 132cdeec908bd5d00d072a4311fdbac70b7d7902..716f8d426a068a1ae0598cec6022fa54a84e78c9 100644 (file)
--- 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)