diff --git a/.travis.yml b/.travis.yml index 4fb4081..89d0689 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: go install: - go get github.com/cyfdecyf/leakybuf - - mkdir -p $GOPATH/src/github.com/shadowsocks/shadowsocks-go/shadowsocks - - mv * $GOPATH/src/github.com/shadowsocks/shadowsocks-go - - pushd $GOPATH/src/github.com/shadowsocks/shadowsocks-go + - go get code.google.com/p/go.crypto/blowfish + - go get code.google.com/p/go.crypto/cast5 + - pushd $TRAVIS_BUILD_DIR - go install ./cmd/shadowsocks-local - go install ./cmd/shadowsocks-server - popd diff --git a/config.json b/config.json index 029aa20..0a9f319 100644 --- a/config.json +++ b/config.json @@ -3,6 +3,5 @@ "server_port":8388, "local_port":1080, "password":"barfoo!", - "method": null, "timeout":600 } diff --git a/script/test.sh b/script/test.sh index a936672..41a9fdf 100755 --- a/script/test.sh +++ b/script/test.sh @@ -82,7 +82,7 @@ SERVER="shadowsocks-server" LOCAL="shadowsocks-local" test_server_local_pair -if [ -n $SS_NODEJS ]; then +if [[ -n $SS_NODEJS ]]; then pushd $SS_NODEJS SERVER="node server.js" diff --git a/shadowsocks/encrypt.go b/shadowsocks/encrypt.go index 21b1f0b..1626107 100644 --- a/shadowsocks/encrypt.go +++ b/shadowsocks/encrypt.go @@ -224,4 +224,6 @@ func (c *Cipher) Copy() *Cipher { nc.dec = nil return &nc } + // should not reach here, keep it to make go 1.0.x compiler happy + return nil }