diff --git a/configure.ac b/configure.ac index 0f9aacce..28583fdb 100755 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl -*- Autoconf -*- dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.67]) -AC_INIT([shadowsocks], [1.4.6], [max.c.lv@gmail.com]) +AC_INIT([shadowsocks], [1.4.7], [max.c.lv@gmail.com]) AC_CONFIG_SRCDIR([src/encrypt.c]) AC_CONFIG_HEADERS([config.h]) diff --git a/debian/changelog b/debian/changelog index 3854c48b..851523ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -shadowsocks (1.4.6-1) untable; urgency=low +shadowsocks (1.4.7-1) unstable; urgency=low + + * Add a new encryptor rc4-md5. + + -- Max Lv Tue, 09 Sep 2014 07:50:10 +0800 + +shadowsocks (1.4.6-1) unstable; urgency=low * Add ACL support. diff --git a/openwrt/Makefile b/openwrt/Makefile index a3ba1fe9..7d9e72c2 100644 --- a/openwrt/Makefile +++ b/openwrt/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shadowsocks-libev -PKG_VERSION:=1.4.6 +PKG_VERSION:=1.4.7 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE_URL:=https://github.com/madeye/shadowsocks-libev/archive diff --git a/shadowsocks.8 b/shadowsocks.8 index fbc6e486..c45026dc 100644 --- a/shadowsocks.8 +++ b/shadowsocks.8 @@ -66,7 +66,7 @@ password. .TP .B \-m \fIencrypt_method\fP Set the cipher. Shadowsocks accepts 14 different ciphers: table, rc4, -aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, camellia-128-cfb, +rc4-md5, aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, camellia-128-cfb, camellia-192-cfb, camellia-256-cfb, cast5-cfb, des-cfb, idea-cfb, rc2-cfb and seed-cfb. The default method is \fItable\fP. If compiled with PolarSSL or custom OpenSSL builds, some of these ciphers may not work. diff --git a/src/utils.c b/src/utils.c index 38ecb032..0001844a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -209,7 +209,7 @@ void usage() printf(" -k password of your remote server\n"); printf("\n"); printf("\n"); - printf(" [-m ] encrypt method: table, rc4,\n"); + printf(" [-m ] encrypt method: table, rc4, rc4-md5,\n"); printf(" aes-128-cfb, aes-192-cfb, aes-256-cfb,\n"); printf(" bf-cfb, camellia-128-cfb, camellia-192-cfb,\n"); printf(" camellia-256-cfb, cast5-cfb, des-cfb,\n");