Bump version to 1.1.5

wong2008x · May 4, 2016 · 0206d55 · 0206d55
1 parent 94e33e7
commit 0206d55
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 *.deb
 script/http
+bin
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 1.1.4 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.1.5 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
 
 shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 
@@ -12,7 +12,7 @@ The protocol is compatible with the origin shadowsocks (if both have been upgrad
 
 # Install
 
-Compiled client binaries can be download [here](http://dl.chenyufei.info/shadowsocks/). (All compiled with cgo disabled, except the mac version.)
+Download precompiled binarys from the [release page](https://github.com/shadowsocks/shadowsocks-go/releases). (All compiled with cgo disabled, except the mac version.)
 
 You can also install from source (assume you have go installed):
 
@@ -55,6 +55,13 @@ AES is recommended for shadowsocks-go. [Intel AES Instruction Set](http://en.wik
 
 **rc4 and table encryption methods are deprecated because they are not secure.**
 
+### One Time Auth
+
+Append `-ota` to the encryption method to enable [One Time Auth (OTA)](https://shadowsocks.org/en/spec/one-time-auth.html).
+
+- For server: this will **force client use OTA**, non-OTA connection will be dropped. Otherwise, both OTA and non-OTA clients can connect
+- For client: the `-A` command line option can also enable OTA
+
 ## Command line options
 
 Command line options can override settings from configuration files. Use `-h` option to see all available options.

diff --git a/config.json b/config.json
@@ -3,6 +3,6 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "method": "aes-128-cfb",
+    "method": "aes-128-cfb-ota",
     "timeout":600
 }
diff --git a/script/build.sh b/script/build.sh
@@ -49,13 +49,13 @@ build linux 386 linux32 local
 build windows amd64 win64 local
 build windows 386 win32 local
 
+#build darwin amd64 mac64 server
 build linux amd64 linux64 server
 build linux 386 linux32 server
-build darwin amd64 mac64 server
 build windows amd64 win64 server
 build windows 386 win32 server
 
 #script/createdeb.sh amd64
-#script/createdeb.sh i386
+#script/createdeb.sh 386
 #mv shadowsocks-go_$version-1-*.deb bin/
 #rm -rf shadowsocks-go_$version-1*
diff --git a/script/test.sh b/script/test.sh
@@ -74,7 +74,7 @@ test_shadowsocks() {
     server_pid=$!
     wait_server $SERVER_PORT
 
-    $LOCAL $OPTION -s 127.0.0.1 -l $LOCAL_PORT -m "$method" &
+    $LOCAL $OPTION -s 127.0.0.1 -l $LOCAL_PORT -m "$method" -A &
     local_pid=$!
     wait_server $LOCAL_PORT
 
@@ -103,8 +103,8 @@ test_server_local_pair() {
     url=http://127.0.0.1:$HTTP_PORT/README.md
     test_shadowsocks $url rc4-md5
     test_shadowsocks $url aes-128-cfb
-    test_shadowsocks $url aes-192-cfb
-    test_shadowsocks $url aes-256-cfb
+    #test_shadowsocks $url aes-192-cfb
+    #test_shadowsocks $url aes-256-cfb
     test_shadowsocks $url bf-cfb
     test_shadowsocks $url des-cfb
     test_shadowsocks $url cast5-cfb

diff --git a/shadowsocks/util.go b/shadowsocks/util.go
@@ -10,7 +10,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "1.1.4"
+	const version = "1.1.5"
 	fmt.Println("shadowsocks-go version", version)
 }