nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

crypt_openssl_mgt: define DISABLE_ENGINES after OPENSSL_NO_ENGINE

Browse Source 
With LibreSSL-3.8.1 these engines are no long available causing a build
failure, but LibreSSL correctly defines OPENSSL_NO_ENGINE as part of its
opensslfeatures.h. However Tor includes crypto_openssl_mgt.h before any
of the openssl includes which would define OPENSSL_NO_ENGINE and then
fails to define DISABLE_ENGINES.

As the define is used in only a single .c file it is best to move it
there.

Signed-off-by: orbea <orbea@riseup.net>
This commit is contained in:
orbea 2023-08-31 14:35:52 -07:00
parent 3b17635f46
commit 48f8d69189
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/crypt_ops/crypto_openssl_mgt.c
View File

@ -40,6 +40,11 @@ ENABLE_GCC_WARNING("-Wredundant-decls")
#include <string.h> #include <string.h>
#ifdef OPENSSL_NO_ENGINE
/* Android's OpenSSL seems to have removed all of its Engine support. */
#define DISABLE_ENGINES
#endif
#ifndef NEW_THREAD_API #ifndef NEW_THREAD_API
/** A number of preallocated mutexes for use by OpenSSL. */ /** A number of preallocated mutexes for use by OpenSSL. */
static tor_mutex_t **openssl_mutexes_ = NULL; static tor_mutex_t **openssl_mutexes_ = NULL;

5
src/lib/crypt_ops/crypto_openssl_mgt.h
View File

@ -49,11 +49,6 @@
#define OPENSSL_V_SERIES(a,b,c) \ #define OPENSSL_V_SERIES(a,b,c) \
OPENSSL_VER((a),(b),(c),0,0) OPENSSL_VER((a),(b),(c),0,0)
#ifdef OPENSSL_NO_ENGINE
/* Android's OpenSSL seems to have removed all of its Engine support. */
#define DISABLE_ENGINES
#endif
#if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5) #if OPENSSL_VERSION_NUMBER >= OPENSSL_VER(1,1,0,0,5)
/* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require /* OpenSSL as of 1.1.0pre4 has an "new" thread API, which doesn't require
* setting up various callbacks. * setting up various callbacks.