Commit 36fe6d20 authored by Max Lv's avatar Max Lv

update to shadowsocks-libev 1.3

parent 1e16a26b
...@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._ ...@@ -5,8 +5,8 @@ import org.scalasbt.androidplugin._
import org.scalasbt.androidplugin.AndroidKeys._ import org.scalasbt.androidplugin.AndroidKeys._
object App { object App {
val version = "1.4.6" val version = "1.5.1"
val versionCode = 28 val versionCode = 29
} }
object General { object General {
......
...@@ -130,13 +130,15 @@ include $(BUILD_EXECUTABLE) ...@@ -130,13 +130,15 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS) 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_MODULE := shadowsocks
LOCAL_SRC_FILES := $(addprefix shadowsocks/src/, $(SHADOWSOCKS_SOURCES)) 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 LOCAL_LDLIBS := -llog
......
Subproject commit e5c94e7c20f1f3f019a717e2e6f4389b94ff7d53 Subproject commit 4ea69468b4e677d89e2d27a3f497e825875419ae
...@@ -20,12 +20,24 @@ ...@@ -20,12 +20,24 @@
<string name="sitekey_summary">Password of your Shadowsocks server</string> <string name="sitekey_summary">Password of your Shadowsocks server</string>
<string name="enc_method">Encrypt Method</string> <string name="enc_method">Encrypt Method</string>
<array name="enc_method_entry"> <array name="enc_method_entry">
<item>Table</item> <item>TABLE</item>
<item>RC4</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>
<array name="enc_method_value"> <array name="enc_method_value">
<item>table</item> <item>table</item>
<item>rc4</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> </array>
<!-- feature category --> <!-- feature category -->
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment