From 67bc31f2626acbbd2b35c93566d2e40ecbe58b44 Mon Sep 17 00:00:00 2001 From: gVisor bot Date: Fri, 21 Sep 2018 15:27:51 +0800 Subject: [PATCH] Improve: add rc4-md5 and chacha20 supported with the fork --- Gopkg.lock | 36 +++++++++++++++++----------------- Gopkg.toml | 8 ++++---- adapters/local/socket.go | 2 +- adapters/local/util.go | 2 +- adapters/remote/shadowsocks.go | 4 ++-- adapters/remote/socks5.go | 2 +- proxy/redir/tcp_darwin.go | 2 +- proxy/redir/tcp_linux.go | 2 +- proxy/redir/tcp_windows.go | 2 +- proxy/socks/tcp.go | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 638a039a..394ed3ad 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,6 +1,19 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + digest = "1:d21e998147c1c8cd727bd34148f373d3faa46fd8669c389b53c4eaabbe4eb2b3" + name = "github.com/Dreamacro/go-shadowsocks2" + packages = [ + "core", + "shadowaead", + "shadowstream", + "socks", + ] + pruneopts = "UT" + revision = "1c1fd6c192eb76261ea3ccd80e3b141b25f20db4" + version = "v0.1.1" + [[projects]] branch = "master" digest = "1:8fa55a6e302771a90a86ceae1ca3c0df4ef15d21092198e8313f61dde9eea963" @@ -65,19 +78,6 @@ revision = "c5bec84d1963260297932a1b7a1753c8420717a7" version = "v1.3.0" -[[projects]] - digest = "1:2bfa1a73654feb90893014b04779ce5205f3e19e843c0e32a89ea051d31f12d5" - name = "github.com/riobard/go-shadowsocks2" - packages = [ - "core", - "shadowaead", - "shadowstream", - "socks", - ] - pruneopts = "UT" - revision = "8346403248229fc7e10d7a259de8e9352a9d8830" - version = "v0.1.0" - [[projects]] digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc" name = "github.com/sirupsen/logrus" @@ -99,11 +99,11 @@ "ssh/terminal", ] pruneopts = "UT" - revision = "0709b304e793a5edb4a2c0145f281ecdc20838a4" + revision = "0e37d006457bf46f9e6692014ba72ef82c33022c" [[projects]] branch = "master" - digest = "1:576f8d82185dc836ec6d10c0e5568dc4ff94e4d9f101d33ed5d6bae0cbba65b2" + digest = "1:ddbafa32d1899456edbf7a64aec7afe5aa287b840e6a12b996f8a8425c1d9a6a" name = "golang.org/x/sys" packages = [ "cpu", @@ -111,7 +111,7 @@ "windows", ] pruneopts = "UT" - revision = "ebe1bf3edb3325c393447059974de898d5133eb8" + revision = "d641721ec2dead6fe5ca284096fe4b1fcd49e427" [[projects]] digest = "1:975a4480c40f2d0b95e1f83d3ec1aa29a2774e80179e08a9a4ba2aab86721b23" @@ -133,13 +133,13 @@ analyzer-name = "dep" analyzer-version = 1 input-imports = [ + "github.com/Dreamacro/go-shadowsocks2/core", + "github.com/Dreamacro/go-shadowsocks2/socks", "github.com/go-chi/chi", "github.com/go-chi/cors", "github.com/go-chi/render", "github.com/gofrs/uuid", "github.com/oschwald/geoip2-golang", - "github.com/riobard/go-shadowsocks2/core", - "github.com/riobard/go-shadowsocks2/socks", "github.com/sirupsen/logrus", "golang.org/x/crypto/chacha20poly1305", "gopkg.in/eapache/channels.v1", diff --git a/Gopkg.toml b/Gopkg.toml index 9b9d252d..799ede7d 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -25,6 +25,10 @@ # unused-packages = true +[[constraint]] + name = "github.com/Dreamacro/go-shadowsocks2" + version = "0.1.1" + [[constraint]] name = "github.com/go-chi/chi" version = "3.3.3" @@ -45,10 +49,6 @@ name = "github.com/oschwald/geoip2-golang" version = "1.2.1" -[[constraint]] - name = "github.com/riobard/go-shadowsocks2" - version = "0.1.0" - [[constraint]] name = "github.com/sirupsen/logrus" version = "1.0.6" diff --git a/adapters/local/socket.go b/adapters/local/socket.go index 4143e746..ff9b09c3 100644 --- a/adapters/local/socket.go +++ b/adapters/local/socket.go @@ -4,7 +4,7 @@ import ( "net" C "github.com/Dreamacro/clash/constant" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) // SocketAdapter is a adapter for socks and redir connection diff --git a/adapters/local/util.go b/adapters/local/util.go index c0c86d1f..0a713421 100644 --- a/adapters/local/util.go +++ b/adapters/local/util.go @@ -6,7 +6,7 @@ import ( "strconv" C "github.com/Dreamacro/clash/constant" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) func parseSocksAddr(target socks.Addr) *C.Addr { diff --git a/adapters/remote/shadowsocks.go b/adapters/remote/shadowsocks.go index 919a9393..8c0a0987 100644 --- a/adapters/remote/shadowsocks.go +++ b/adapters/remote/shadowsocks.go @@ -10,8 +10,8 @@ import ( "github.com/Dreamacro/clash/common/simple-obfs" C "github.com/Dreamacro/clash/constant" - "github.com/riobard/go-shadowsocks2/core" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/core" + "github.com/Dreamacro/go-shadowsocks2/socks" ) // ShadowsocksAdapter is a shadowsocks adapter diff --git a/adapters/remote/socks5.go b/adapters/remote/socks5.go index 5be06387..5464dd98 100644 --- a/adapters/remote/socks5.go +++ b/adapters/remote/socks5.go @@ -9,7 +9,7 @@ import ( C "github.com/Dreamacro/clash/constant" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) // Socks5Adapter is a shadowsocks adapter diff --git a/proxy/redir/tcp_darwin.go b/proxy/redir/tcp_darwin.go index 3fe7803f..f032a03d 100644 --- a/proxy/redir/tcp_darwin.go +++ b/proxy/redir/tcp_darwin.go @@ -5,7 +5,7 @@ import ( "syscall" "unsafe" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) func parserPacket(c net.Conn) (socks.Addr, error) { diff --git a/proxy/redir/tcp_linux.go b/proxy/redir/tcp_linux.go index 836b2e5d..1cd5a3ee 100644 --- a/proxy/redir/tcp_linux.go +++ b/proxy/redir/tcp_linux.go @@ -6,7 +6,7 @@ import ( "syscall" "unsafe" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) const ( diff --git a/proxy/redir/tcp_windows.go b/proxy/redir/tcp_windows.go index a749c117..cce61c07 100644 --- a/proxy/redir/tcp_windows.go +++ b/proxy/redir/tcp_windows.go @@ -4,7 +4,7 @@ import ( "errors" "net" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" ) func parserPacket(conn net.Conn) (socks.Addr, error) { diff --git a/proxy/socks/tcp.go b/proxy/socks/tcp.go index 5aa8ccc1..da9a85bd 100644 --- a/proxy/socks/tcp.go +++ b/proxy/socks/tcp.go @@ -7,7 +7,7 @@ import ( C "github.com/Dreamacro/clash/constant" "github.com/Dreamacro/clash/tunnel" - "github.com/riobard/go-shadowsocks2/socks" + "github.com/Dreamacro/go-shadowsocks2/socks" log "github.com/sirupsen/logrus" )