From 8461a5b3db34ed0b5a4a18d82f64fd5ac8693ea8 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 6 Apr 2020 20:54:34 +1000 Subject: [PATCH] Include openssl-compat.h before checking ifdefs. Fixes problem where unsuitable chacha20 code in libressl would be used unintentionally. --- cipher-chachapoly-libcrypto.c | 3 +++ cipher-chachapoly.c | 3 +++ 2 files changed, 6 insertions(+) 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)