From daf10395a308a1b41eb69ea2866411c9d8e65d7c Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Sat, 17 Apr 2021 09:42:11 -0700 Subject: [PATCH] update deps --- go.mod | 49 ++++++++++++++++++++++++------------------------ go.sum | 5 ++--- src/cli/cli.go | 2 +- src/croc/croc.go | 2 +- src/tcp/tcp.go | 2 +- 5 files changed, 29 insertions(+), 31 deletions(-) diff --git a/go.mod b/go.mod index 2e02498..61b23f1 100644 --- a/go.mod +++ b/go.mod @@ -1,28 +1,27 @@ module github.com/schollz/croc/v8 + go 1.13 -replace github.com/schollz/pake3 => ../pake3 + require ( -github.com/OneOfOne/xxhash v1.2.5 // indirect -github.com/cespare/xxhash v1.1.0 -github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect -github.com/denisbrodbeck/machineid v1.0.1 -github.com/kalafut/imohash v1.0.0 -github.com/kr/pretty v0.1.0 // indirect -github.com/russross/blackfriday/v2 v2.1.0 // indirect -github.com/schollz/cli/v2 v2.2.1 -github.com/schollz/logger v1.2.0 -github.com/schollz/mnemonicode v1.0.1 -github.com/schollz/pake/v2 v2.0.7 -github.com/schollz/pake3 v0.0.0-00010101000000-000000000000 -github.com/schollz/peerdiscovery v1.6.3 -github.com/schollz/progressbar/v3 v3.7.6 -github.com/spaolacci/murmur3 v1.1.0 // indirect -github.com/stretchr/testify v1.6.1 -github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094 -golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 -golang.org/x/net v0.0.0-20210326220855-61e056675ecf -golang.org/x/sys v0.0.0-20210326220804-49726bf1d181 // indirect -golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect -golang.org/x/text v0.3.5 // indirect -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect -) \ No newline at end of file + github.com/OneOfOne/xxhash v1.2.5 // indirect + github.com/cespare/xxhash v1.1.0 + github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect + github.com/denisbrodbeck/machineid v1.0.1 + github.com/kalafut/imohash v1.0.0 + github.com/kr/pretty v0.1.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/schollz/cli/v2 v2.2.1 + github.com/schollz/logger v1.2.0 + github.com/schollz/mnemonicode v1.0.1 + github.com/schollz/pake/v3 v3.0.0-20210417162517-73e32835a3d0 + github.com/schollz/peerdiscovery v1.6.3 + github.com/schollz/progressbar/v3 v3.7.6 + github.com/spaolacci/murmur3 v1.1.0 // indirect + github.com/stretchr/testify v1.6.1 + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 + golang.org/x/net v0.0.0-20210326220855-61e056675ecf + golang.org/x/sys v0.0.0-20210326220804-49726bf1d181 // indirect + golang.org/x/term v0.0.0-20210317153231-de623e64d2a6 // indirect + golang.org/x/text v0.3.5 // indirect + gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect +) diff --git a/go.sum b/go.sum index d3ce5e9..32f897a 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ github.com/schollz/logger v1.2.0 h1:5WXfINRs3lEUTCZ7YXhj0uN+qukjizvITLm3Ca2m0Ho= github.com/schollz/logger v1.2.0/go.mod h1:P6F4/dGMGcx8wh+kG1zrNEd4vnNpEBY/mwEMd/vn6AM= github.com/schollz/mnemonicode v1.0.1 h1:LiH5hwADZwjwnfXsaD4xgnMyTAtaKHN+e5AyjRU6WSU= github.com/schollz/mnemonicode v1.0.1/go.mod h1:cl4UAOhUV0mkdjMj/QYaUZbZZdF8BnOqoz8rHMzwboY= -github.com/schollz/pake/v2 v2.0.7 h1:pMd7VRwEytDLFXP3vf5UksO6/zxcEoEhb4jaqb6NRR4= -github.com/schollz/pake/v2 v2.0.7/go.mod h1:9pvRBp3hcsPYRJre5t3dP6HFOkPG80bUqzDwB7PP3Ec= +github.com/schollz/pake/v3 v3.0.0-20210417162517-73e32835a3d0 h1:OdIvrbSi1RDKc9Olim4M+Sh0hms7ZU9kXNoXGG17UwA= +github.com/schollz/pake/v3 v3.0.0-20210417162517-73e32835a3d0/go.mod h1:U8udmizi/9pb5OqW+ieb4ebU5wGCqnLhXqYXSJRpeD4= github.com/schollz/peerdiscovery v1.6.3 h1:qoawrl3GBwf8ff3Itb0QkaUGDb2k40NwE24MEgFL4Gc= github.com/schollz/peerdiscovery v1.6.3/go.mod h1:xpt6HDA944jqSLzJMLreYtmhWeS2OW2XW4ZLmCezi00= github.com/schollz/progressbar/v3 v3.7.6 h1:akAvVpTy2IAcePWYndctoBaY9bLE3z4LE1Hn91BJ9g4= @@ -57,7 +57,6 @@ github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094 h1:tZWtuLE+LbUwT4OP1 github.com/tscholl2/siec v0.0.0-20191122224205-8da93652b094/go.mod h1:KL9+ubr1JZdaKjgAaHr+tCytEncXBa1pR6FjbTsOJnw= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20210314154223-e6e6c4f2bb5b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 h1:It14KIkyBFYkHkwZ7k45minvA9aorojkyjGk9KJ5B/w= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= diff --git a/src/cli/cli.go b/src/cli/cli.go index 7978f76..e80e006 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -20,7 +20,7 @@ import ( "github.com/schollz/croc/v8/src/tcp" "github.com/schollz/croc/v8/src/utils" log "github.com/schollz/logger" - pake "github.com/schollz/pake3" + "github.com/schollz/pake/v3" ) // Version specifies the version diff --git a/src/croc/croc.go b/src/croc/croc.go index fd078ce..f1a9abd 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -20,7 +20,7 @@ import ( "github.com/denisbrodbeck/machineid" log "github.com/schollz/logger" - pake "github.com/schollz/pake3" + "github.com/schollz/pake/v3" "github.com/schollz/peerdiscovery" "github.com/schollz/progressbar/v3" diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go index cd0fc59..2b9b610 100644 --- a/src/tcp/tcp.go +++ b/src/tcp/tcp.go @@ -9,7 +9,7 @@ import ( "time" log "github.com/schollz/logger" - pake "github.com/schollz/pake3" + "github.com/schollz/pake/v3" "github.com/schollz/croc/v8/src/comm" "github.com/schollz/croc/v8/src/crypt"