mirrors_public/schollz_croc
0
0
Fork 0
mirror of https://github.com/schollz/croc.git synced 2025-10-11 13:21:00 +02:00
Code Activity

update deps

Browse source
This commit is contained in:
Zack Scholl 2018-10-21 07:43:45 -07:00
parent ace9b35e34
commit 9e7661c1b0
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
go.mod
View file

@ -4,6 +4,7 @@ require (
github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575 github.com/cihub/seelog v0.0.0-20170130134532-f561c5e57575
github.com/dustin/go-humanize v1.0.0 github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.7.0 // indirect 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/gorilla/websocket v1.4.0
github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-colorable v0.0.9 // indirect
github.com/mattn/go-isatty v0.0.4 // 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/progressbar/v2 v2.6.0
github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9 github.com/schollz/spinner v0.0.0-20180925172146-6bbc5f7804f9
github.com/skratchdot/open-golang v0.0.0-20160302144031-75fb7ed4208c 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/tscholl2/siec v0.0.0-20180721101609-21667da05937
github.com/urfave/cli v1.20.0 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 golang.org/x/net v0.0.0-20181017193950-04a2e542c03f // indirect
) )

2
src/croc/sending.go
View file

@ -96,7 +96,7 @@ func (c *Croc) Receive(codephrase string) (err error) {
log.Debug(errDiscover) log.Debug(errDiscover)
} }
if len(discovered) > 0 { if len(discovered) > 0 {
if discovered[0].Address == utils.GetLocalIP() { if discovered[0].Address == utils.LocalIP() {
discovered[0].Address = "localhost" discovered[0].Address = "localhost"
} }
log.Debugf("discovered %s:%s", discovered[0].Address, discovered[0].Payload) log.Debugf("discovered %s:%s", discovered[0].Address, discovered[0].Payload)

2
src/crypt/crypt.go
View file

@ -9,7 +9,7 @@ import (
"errors" "errors"
"strings" "strings"
"golang.org/x/crypto/pbkdf2" "github.com/golang/crypto/pbkdf2"
) )
// Encryption stores the data // Encryption stores the data