Unverified Commit d6417f6c authored by Paul Howarth's avatar Paul Howarth Committed by Daniel Stenberg
Browse files

openssl: assume engine support in 1.0.0 or later 

Commit 38203f15 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
parent 48cf45c5

lib/vtls/openssl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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>