[openssh-commits] [openssh] 01/01: Explicitly include openssl before zlib.

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit c77bc73c91bc656e343a1961756e09dd1b170820
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Fri Jul 20 13:48:51 2018 +1000

    Explicitly include openssl before zlib.
    
    Some versions of OpenSSL have "free_func" in their headers, which zlib
    typedefs.  Including openssl after zlib (eg via sshkey.h) results in
    "syntax error before `free_func'", which this fixes.
---
 packet.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/packet.c b/packet.c
index 0ae65bd3..dcf35e6e 100644
--- a/packet.c
+++ b/packet.c
@@ -61,6 +61,18 @@
 #include <signal.h>
 #include <time.h>
 
+/*
+ * Explicitly include OpenSSL before zlib as some versions of OpenSSL have
+ * "free_func" in their headers, which zlib typedefs.
+ */
+#ifdef WITH_OPENSSL
+# include <openssl/bn.h>
+# include <openssl/evp.h>
+# ifdef OPENSSL_HAS_ECC
+#  include <openssl/ec.h>
+# endif
+#endif
+
 #include <zlib.h>
 
 #include "xmalloc.h"

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.