From e22b1450234d6cb64df686eb5ded76c99d9093b4 Mon Sep 17 00:00:00 2001
From: Max Lv <max.c.lv@gmail.com>
Date: Fri, 21 Nov 2014 14:51:16 +0800
Subject: [PATCH] fix #158

---
 src/main/AndroidManifest.xml                     | 4 ++--
 src/main/jni/openssl/android-config.mk           | 2 +-
 src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 57797b47..4726f180 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.github.shadowsocks"
-    android:versionCode="83"
-    android:versionName="2.4.3">
+    android:versionCode="84"
+    android:versionName="2.4.4">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
diff --git a/src/main/jni/openssl/android-config.mk b/src/main/jni/openssl/android-config.mk
index 1fa94a37..4a4f2151 100644
--- a/src/main/jni/openssl/android-config.mk
+++ b/src/main/jni/openssl/android-config.mk
@@ -15,7 +15,7 @@ LOCAL_CFLAGS += -DOPENSSL_NO_EC_NISTP_64_GCC_128 -DOPENSSL_NO_SCTP \
 # LOCAL_CFLAGS += -DOPENSSL_NO_DEPRECATED
 
 # Extra
-LOCAL_CFLAGS += -DOPENSSL_NO_HW -DOPENSSL_NO_ASM -DOPENSSL_NO_ENGINE -DZLIB
+LOCAL_CFLAGS += -DOPENSSL_NO_HW -DOPENSSL_NO_ENGINE -DZLIB
 
 # Debug
 # LOCAL_CFLAGS += -DCIPHER_DEBUG
diff --git a/src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c b/src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c
index 56563191..ee2bc45a 100644
--- a/src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c
+++ b/src/main/jni/openssl/crypto/evp/e_rc4_hmac_md5.c
@@ -100,8 +100,8 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
 	return 1;
 	}
 
+// Disable asm for Android x86_64
 #if	!defined(OPENSSL_NO_ASM) &&	( \
-	defined(__x86_64)	|| defined(__x86_64__)	|| \
 	defined(_M_AMD64)	|| defined(_M_X64)	|| \
 	defined(__INTEL__)		) && \
 	!(defined(__APPLE__) && defined(__MACH__))