update to shadowsocks-libev 1.3

project/Build.scala

@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._
 import org.scalasbt.androidplugin.AndroidKeys._
 
 object App {
-  val version = "1.4.6"
-  val versionCode = 28
+  val version = "1.5.1"
+  val versionCode = 29
 }
 
 object General {

src/main/jni/Android.mk

@@ -130,13 +130,15 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
-SHADOWSOCKS_SOURCES := local.c encrypt.c rc4.c md5.c utils.c json.c jconf.c
+SHADOWSOCKS_SOURCES := local.c encrypt.c utils.c json.c jconf.c
 
 LOCAL_MODULE    := shadowsocks 
 LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES))
-LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -I$(LOCAL_PATH)/libev/ -DHAVE_CONFIG_H -DANDROID
+LOCAL_CFLAGS    := -Wall -O2 -fno-strict-aliasing -DANDROID -DHAVE_CONFIG_H \
+	-I$(LOCAL_PATH)/libev/ \
+	-I$(LOCAL_PATH)/openssl/include 
 
-LOCAL_STATIC_LIBRARIES := libev
+LOCAL_STATIC_LIBRARIES := libev libcrypto
 
 LOCAL_LDLIBS := -llog
 

src/main/res/values/strings.xml

@@ -20,12 +20,24 @@
   <string name="sitekey_summary">Password of your Shadowsocks server</string>
   <string name="enc_method">Encrypt Method</string>
   <array name="enc_method_entry">
-    <item>Table</item>
+    <item>TABLE</item>
     <item>RC4</item>
+    <item>AES-128-CFB</item>
+    <item>AES-192-CFB</item>
+    <item>AES-256-CFB</item>
+    <item>BF-CFB</item>
+    <item>CAST5-CFB</item>
+    <item>DES-CFB</item>
   </array>
   <array name="enc_method_value">
     <item>table</item>
     <item>rc4</item>
+    <item>aes-128-cfba</item>
+    <item>aes-192-cfba</item>
+    <item>aes-256-cfbb</item>
+    <item>bf-cfbc</item>
+    <item>cast5-cfb</item>
+    <item>des-cfb</item>
   </array>
 
   <!-- feature category -->