diff options
author | Darren Tucker <dtucker@dtucker.net> | 2018-07-20 13:48:51 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2018-07-20 13:48:51 +1000 |
commit | c77bc73c91bc656e343a1961756e09dd1b170820 (patch) | |
tree | bea499e9c9aeca97f773c6dedb4654e4f2c75d43 | |
parent | 95d41e90eafcd1286a901e8e361e4a37b98aeb52 (diff) |
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.
-rw-r--r-- | packet.c | 12 |
1 files changed, 12 insertions, 0 deletions
@@ -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" |