[tor-commits] [tor/release-0.3.5] Fix compilation when openssl is compiled without engine support.

[asn@xxxxxxxxxxxxxx]

commit b9abdcd6bce961baea17274ff6d213322d2b46d7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Feb 8 08:50:04 2019 -0500

    Fix compilation when openssl is compiled without engine support.
    
    Patch from Mangix. Closes part of ticket 29026.
---
 src/lib/crypt_ops/aes_openssl.c        | 2 +-
 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
index 42ee924a8..2f985d451 100644
--- 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
index 83fb44cad..a3dd03aa0 100644
--- 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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits