fix #158 and #155

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:versionCode="84"
-    android:versionName="2.4.3">
+    android:versionName="2.4.4">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

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

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__))