diff options
| author | Paul Howarth <paul@city-fan.org> | 2018-07-11 12:01:38 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2018-07-11 23:40:10 +0200 |
| commit | d6417f6c2ddb10099da2c7ad0ffeebaa732aa824 (patch) | |
| tree | 2c9cff5a4b3821ea7a9bde98dcbdbc88e6881efb | |
| parent | 48cf45c5aa541d1a13d1d82d6a28e7233895c6e9 (diff) | |
| download | curl-d6417f6c2ddb10099da2c7ad0ffeebaa732aa824.tar.gz | |
openssl: assume engine support in 1.0.0 or later
Commit 38203f1585da changed engine detection to be version-based,
with a baseline of openssl 1.0.1. This does in fact break builds
with openssl 1.0.0, which has engine support - the configure script
detects that ENGINE_cleanup() is available - but <openssl/engine.h>
doesn't get included to declare it.
According to upstream documentation, engine support was added to
mainstream openssl builds as of version 0.9.7:
https://github.com/openssl/openssl/blob/master/README.ENGINE
This commit drops the version test down to 1.0.0 as version 1.0.0d
is the oldest version I have to test with.
Closes #2732
| -rw-r--r-- | lib/vtls/openssl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index 0b1929bd7..d5b474771 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -69,7 +69,7 @@ #include <openssl/ocsp.h> #endif -#if (OPENSSL_VERSION_NUMBER >= 0x10001000L) && /* 1.0.1 or later */ \ +#if (OPENSSL_VERSION_NUMBER >= 0x10000000L) && /* 1.0.0 or later */ \ !defined(OPENSSL_NO_ENGINE) #define USE_OPENSSL_ENGINE #include <openssl/engine.h> |