tor

commit b9abdcd6bce961baea17274ff6d213322d2b46d7
parent ab6534781996404ca57e9f5b0cbdda998579c329
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri,  8 Feb 2019 08:50:04 -0500

Fix compilation when openssl is compiled without engine support.

Patch from Mangix. Closes part of ticket 29026.

Diffstat:
M
src/lib/crypt_ops/aes_openssl.c
 | 
2
+-
M
src/lib/crypt_ops/crypto_openssl_mgt.h
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/crypt_ops/aes_openssl.c b/src/lib/crypt_ops/aes_openssl.c
@@ -43,7 +43,7 @@ ENABLE_GCC_WARNING(redundant-decls)
 #include "lib/log/log.h"
 #include "lib/ctime/di_ops.h"
 
-#ifdef ANDROID
+#ifdef OPENSSL_NO_ENGINE
 /* Android's OpenSSL seems to have removed all of its Engine support. */
 #define DISABLE_ENGINES
 #endif
diff --git a/src/lib/crypt_ops/crypto_openssl_mgt.h b/src/lib/crypt_ops/crypto_openssl_mgt.h
@@ -50,7 +50,7 @@
 #define OPENSSL_V_SERIES(a,b,c) \
   OPENSSL_VER((a),(b),(c),0,0)
 
-#ifdef ANDROID
+#ifdef OPENSSL_NO_ENGINE
 /* Android's OpenSSL seems to have removed all of its Engine support. */
 #define DISABLE_ENGINES
 #endif