moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-24 00:58:48 -05:00
Code Issues Releases Wiki Activity

openssl: assume engine support in 1.0.0 or later

Browse Source 
Commit 38203f1585 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
This commit is contained in:
Paul Howarth 2018-07-11 12:01:38 +01:00 committed by Daniel Stenberg
parent 48cf45c5aa
commit d6417f6c2d
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vtls/openssl.c
View File

@ -69,7 +69,7 @@
#include <openssl/ocsp.h> #include <openssl/ocsp.h>
#endif #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) !defined(OPENSSL_NO_ENGINE)
#define USE_OPENSSL_ENGINE #define USE_OPENSSL_ENGINE
#include <openssl/engine.h> #include <openssl/engine.h>