tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include openssl-compat.h before checking ifdefs. 

Fixes problem where unsuitable chacha20 code in libressl would be used
unintentionally.
This commit is contained in:
Darren Tucker 2020-04-06 20:54:34 +10:00
parent 931c50c588
commit 8461a5b3db
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cipher-chachapoly-libcrypto.c
View File

@ -17,6 +17,9 @@
/* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.1 2020/04/03 04:32:21 djm Exp $ */ /* $OpenBSD: cipher-chachapoly-libcrypto.c,v 1.1 2020/04/03 04:32:21 djm Exp $ */
#include "includes.h" #include "includes.h"
#ifdef WITH_OPENSSL
#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)

3
cipher-chachapoly.c
View File

@ -17,6 +17,9 @@
/* $OpenBSD: cipher-chachapoly.c,v 1.9 2020/04/03 04:27:03 djm Exp $ */ /* $OpenBSD: cipher-chachapoly.c,v 1.9 2020/04/03 04:27:03 djm Exp $ */
#include "includes.h" #include "includes.h"
#ifdef WITH_OPENSSL
#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)