Merge branch 'develop', fix go get error using Go 1.4

dearplain · Jan 27, 2015 · 8920bf8 · 8920bf8
2 parents 61d80b0 + 896ea0a
commit 8920bf8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,8 @@ language: go
 go:
   - 1.3
 install:
-  - go get github.com/golang/crypto/blowfish
-  - go get github.com/golang/crypto/cast5
+  - go get golang.org/x/crypto/blowfish
+  - go get golang.org/x/crypto/cast5
   - go install ./cmd/shadowsocks-local
   - go install ./cmd/shadowsocks-server
 script:

diff --git a/shadowsocks/encrypt.go b/shadowsocks/encrypt.go
@@ -2,8 +2,8 @@ package shadowsocks
 
 import (
 	"bytes"
-	"github.com/golang/crypto/blowfish"
-	"github.com/golang/crypto/cast5"
+	"golang.org/x/crypto/blowfish"
+	"golang.org/x/crypto/cast5"
 	"crypto/aes"
 	"crypto/cipher"
 	"crypto/des"