From 2131e9982602706640a31ce8de47a4ce474a5e11 Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Fri, 16 Apr 2021 09:20:13 -0700 Subject: [PATCH] use new pake --- go.mod | 3 +++ src/croc/croc.go | 7 +++---- src/tcp/tcp.go | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 64e824f..e9cea1a 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,8 @@ 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 @@ -14,6 +16,7 @@ require ( 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 // indirect github.com/schollz/peerdiscovery v1.6.3 github.com/schollz/progressbar/v3 v3.7.6 github.com/spaolacci/murmur3 v1.1.0 // indirect diff --git a/src/croc/croc.go b/src/croc/croc.go index 36e5d56..c39a95c 100644 --- a/src/croc/croc.go +++ b/src/croc/croc.go @@ -20,10 +20,9 @@ import ( "github.com/denisbrodbeck/machineid" log "github.com/schollz/logger" - "github.com/schollz/pake/v2" + pake "github.com/schollz/pake3" "github.com/schollz/peerdiscovery" "github.com/schollz/progressbar/v3" - "github.com/tscholl2/siec" "github.com/schollz/croc/v8/src/comm" "github.com/schollz/croc/v8/src/compress" @@ -166,9 +165,9 @@ func New(ops Options) (c *Client, err error) { // initialize pake if c.Options.IsSender { - c.Pake, err = pake.Init([]byte(c.Options.SharedSecret[5:]), 1, siec.SIEC255(), 1*time.Microsecond) + c.Pake, err = pake.InitCurve([]byte(c.Options.SharedSecret[5:]), 1, "siec", 1*time.Microsecond) } else { - c.Pake, err = pake.Init([]byte(c.Options.SharedSecret[5:]), 0, siec.SIEC255(), 1*time.Microsecond) + c.Pake, err = pake.InitCurve([]byte(c.Options.SharedSecret[5:]), 0, "siec", 1*time.Microsecond) } if err != nil { return diff --git a/src/tcp/tcp.go b/src/tcp/tcp.go index 5fabf62..35f990a 100644 --- a/src/tcp/tcp.go +++ b/src/tcp/tcp.go @@ -9,7 +9,7 @@ import ( "time" log "github.com/schollz/logger" - "github.com/schollz/pake/v2" + pake "github.com/schollz/pake3" "github.com/schollz/croc/v8/src/comm" "github.com/schollz/croc/v8/src/crypt"