From 9e7661c1b098a31e822332175c90b38d80b46d8d Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Sun, 21 Oct 2018 07:43:45 -0700 Subject: [PATCH] update deps --- go.mod | 4 ++-- src/croc/sending.go | 2 +- src/crypt/crypt.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index e34c3396..50cadb6f 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ require ( github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/dustin/go-humanize v1.0.0 github.com/fatih/color v1.7.0 // indirect + github.com/golang/crypto v0.0.0-20181015023909-0c41d7ab0a0e github.com/gorilla/websocket v1.4.0 github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.4 // indirect @@ -14,9 +15,8 @@ require ( github.com/schollz/progressbar/v2 v2.6.0 github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9 github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c - github.com/stretchr/testify v1.2.2 github.com/tscholl2/siec v0.0.0-20180721101609-21667da05937 github.com/urfave/cli v1.20.0 - golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e + golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e // indirect golang.org/x/net v0.0.0-20181017193950-04a2e542c03f // indirect ) diff --git a/src/croc/sending.go b/src/croc/sending.go index 7ec054bb..86c2e142 100644 --- a/src/croc/sending.go +++ b/src/croc/sending.go @@ -96,7 +96,7 @@ func (c *Croc) Receive(codephrase string) (err error) { log.Debug(errDiscover) } if len(discovered) > 0 { - if discovered[0].Address == utils.GetLocalIP() { + if discovered[0].Address == utils.LocalIP() { discovered[0].Address = "localhost" } log.Debugf("discovered %s:%s", discovered[0].Address, discovered[0].Payload) diff --git a/src/crypt/crypt.go b/src/crypt/crypt.go index 7160ad53..c2512a2a 100644 --- a/src/crypt/crypt.go +++ b/src/crypt/crypt.go @@ -9,7 +9,7 @@ import ( "errors" "strings" - "golang.org/x/crypto/pbkdf2" + "github.com/golang/crypto/pbkdf2" ) // Encryption stores the data