diff options
| author | Michael Kaufmann <mail@michael-kaufmann.ch> | 2018-11-13 21:41:25 +0100 |
|---|---|---|
| committer | Michael Kaufmann <mail@michael-kaufmann.ch> | 2018-11-21 11:14:26 +0100 |
| commit | 30a65381f97ef1f301285c6dfadc0ac6ba905818 (patch) | |
| tree | 7bbbbb872d0b73b40b173c900aec3499a88e55af | |
| parent | 59311bd3df5da6342312b5dc9b6c91fc2be77d4f (diff) | |
| download | curl-30a65381f97ef1f301285c6dfadc0ac6ba905818.tar.gz | |
ssl: fix compilation with OpenSSL 0.9.7
- ENGINE_cleanup() was used without including "openssl/engine.h"
- enable engine support for OpenSSL 0.9.7
Closes #3266
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 68b464e66..80f8ae1b9 100755 --- a/configure.ac +++ b/configure.ac @@ -1772,7 +1772,6 @@ if test -z "$ssl_backends" -o "x$OPT_SSL" != xno && dnl as it's a macro that needs the header files be included) AC_CHECK_FUNCS( RAND_egd \ - ENGINE_cleanup \ SSL_get_shutdown \ SSLv2_client_method ) diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index f5c6fabb4..e6f9fba34 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -69,7 +69,7 @@ #include <openssl/ocsp.h> #endif -#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && /* 0.9.8 or later */ \ +#if (OPENSSL_VERSION_NUMBER >= 0x0090700fL) && /* 0.9.7 or later */ \ !defined(OPENSSL_NO_ENGINE) #define USE_OPENSSL_ENGINE #include <openssl/engine.h> @@ -1056,7 +1056,7 @@ static void Curl_ossl_cleanup(void) /* Free ciphers and digests lists */ EVP_cleanup(); -#ifdef HAVE_ENGINE_CLEANUP +#ifdef USE_OPENSSL_ENGINE /* Free engine list */ ENGINE_cleanup(); #endif |