dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'
This commit is contained in:
أحمد المحمودي (Ahmed El-Mahmoudy) 2015-04-29 16:08:02 +02:00
parent 81a945e632
commit 8d7c32c84b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
external/Makefile vendored
View File

@ -97,16 +97,25 @@ all: assets
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# openssl # 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: lib/libcrypto.a:
cd 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 make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
lib/libssl.a: lib/libssl.a:
cp config.sub openssl cp config.sub openssl
cp config.guess openssl cp config.guess openssl
cd 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 make CC="$(CC)" ANDROID_DEV=$(NDK_SYSROOT)/usr build_libs
openssl-build-stamp: lib/libcrypto.a lib/libssl.a openssl-build-stamp: lib/libcrypto.a lib/libssl.a

2
external/openssl vendored

@ -1 +1 @@
Subproject commit 2b456034457b58454aae3998a2765b6a5b9bc837 Subproject commit 3df69d3aefde7671053d4e3c242b228e5d79c83f