[tor-commits] [orbot/master] Update OpenSSL to 1.0.2a

[n8fr8 at torproject.org]

commit 8d7c32c84b94d242f86ed09d60a5064d4b868c72
Author: أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net>
Date:   Wed Apr 29 16:08:02 2015 +0200

    Update OpenSSL to 1.0.2a
    
    Also, disable rc4 cipher for 64-bit archs, to avoid this link error for
    tor:
    external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc'
---
 external/Makefile |   13 +++++++++++--
 external/openssl  |    2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/external/Makefile b/external/Makefile
index d9a3443..f499ff5 100644
--- a/external/Makefile
+++ b/external/Makefile
@@ -97,16 +97,25 @@ all: assets
 #------------------------------------------------------------------------------#
 # openssl
 
+# Disable rc4 cipher for 64-bit archs, to avoid this link error for tor:
+# external/lib/libcrypto.a(e_rc4_hmac_md5.o):e_rc4_hmac_md5.c:function rc4_hmac_md5_cipher: error: undefined reference to 'rc4_md5_enc'
+OPENSSL_CONF_FLAG=
+ifneq ($(findstring 64, $(NDK_ABI)),)
+ OPENSSL_CONF_FLAG=no-rc4
+endif
+
 lib/libcrypto.a:
 	cd openssl && \
-		./Configure android -DL_ENDIAN && \
+		./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
+		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
 
 lib/libssl.a:
 	cp config.sub openssl
 	cp config.guess openssl
 	cd openssl && \
-		./Configure android -DL_ENDIAN && \
+		./Configure android -DL_ENDIAN $(OPENSSL_CONF_FLAG) && \
+		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr depend && \
 		make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
 
 openssl-build-stamp: lib/libcrypto.a lib/libssl.a
diff --git a/external/openssl b/external/openssl
index 2b45603..3df69d3 160000
--- a/external/openssl
+++ b/external/openssl
@@ -1 +1 @@
-Subproject commit 2b456034457b58454aae3998a2765b6a5b9bc837
+Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f