From d0bbddc3bac229c844a25a218901adb91728cc28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BA=90=E6=96=87=E9=9B=A8?= <41315874+fumiama@users.noreply.github.com> Date: Fri, 15 Apr 2022 16:19:19 +0800 Subject: [PATCH] update deps --- go.mod | 8 ++++---- go.sum | 19 ++++++++++++------- gold/link/link.go | 2 +- main.go | 4 ++-- upper/services/wg/wg.go | 6 +++--- 5 files changed, 22 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index b492b73..9853842 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,10 @@ module github.com/fumiama/WireGold go 1.18 require ( - github.com/fumiama/blake2b-simd v0.0.0-20220412092318-c99573b3b2b1 - github.com/fumiama/go-base16384 v1.3.0 + github.com/fumiama/blake2b-simd v0.0.0-20220412110131-4481822068bb + github.com/fumiama/go-base16384 v1.4.0 github.com/fumiama/go-x25519 v1.0.0 - github.com/fumiama/gofastTEA v0.0.9 + github.com/fumiama/gofastTEA v0.0.10 github.com/fumiama/water v0.0.0-20211231134027-da391938d6ac github.com/sirupsen/logrus v1.8.1 github.com/wdvxdr1123/ZeroBot v1.5.0-mid.0.20220415071800-9e52436ab5c0 @@ -15,7 +15,7 @@ require ( require ( github.com/fumiama/wintun v0.0.0-20211229152851-8bc97c8034c0 // indirect - golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/sys v0.0.0-20220412211240-33da011f77ad // indirect golang.org/x/text v0.3.7 // indirect ) diff --git a/go.sum b/go.sum index c2c034d..d21e2f0 100644 --- a/go.sum +++ b/go.sum @@ -1,13 +1,14 @@ +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/fumiama/blake2b-simd v0.0.0-20220412092318-c99573b3b2b1 h1:bCiKcUQoZk2E68CPRYROZ9/N1BC21jtjxfqGc+5aoRs= -github.com/fumiama/blake2b-simd v0.0.0-20220412092318-c99573b3b2b1/go.mod h1:Olmv2uLdFllRsvwhzOvG/O/Nvgzg0ViokUL4+hiaRSE= -github.com/fumiama/go-base16384 v1.3.0 h1:J5Xtwh/3alGJt/z/0IFralo5UQA89iFWQqbxj5ZQZi8= -github.com/fumiama/go-base16384 v1.3.0/go.mod h1:RGA715p34BiLoZvPRtaxuo2q25Kq9jFsgUsJb8dwy14= +github.com/fumiama/blake2b-simd v0.0.0-20220412110131-4481822068bb h1:Gd7gIiR68ErTWtxnl/PCycMog6IRdK1ApxrvoAy0lFY= +github.com/fumiama/blake2b-simd v0.0.0-20220412110131-4481822068bb/go.mod h1:Olmv2uLdFllRsvwhzOvG/O/Nvgzg0ViokUL4+hiaRSE= +github.com/fumiama/go-base16384 v1.4.0 h1:4KrtewnmAChrZjPA7/QYc72t+vvsKF+DYB0q1iRPdpo= +github.com/fumiama/go-base16384 v1.4.0/go.mod h1:OEn+947GV5gsbTAnyuUW/SrfxJYUdYupSIQXOuGOcXM= github.com/fumiama/go-x25519 v1.0.0 h1:hiGg9EhseVmGCc8T1jECVkj8Keu/aJ1ZK05RM8Vuavo= github.com/fumiama/go-x25519 v1.0.0/go.mod h1:8VOhfyGZzw4IUs4nCjQFqW9cA3V/QpSCtP3fo2dLNg4= -github.com/fumiama/gofastTEA v0.0.9 h1:adaWz+014vMShnLUNWIHLBs0Yv6JNUohcaXZNtct5J0= -github.com/fumiama/gofastTEA v0.0.9/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk= +github.com/fumiama/gofastTEA v0.0.10 h1:JJJ+brWD4kie+mmK2TkspDXKzqq0IjXm89aGYfoGhhQ= +github.com/fumiama/gofastTEA v0.0.10/go.mod h1:RIdbYZyB4MbH6ZBlPymRaXn3cD6SedlCu5W/HHfMPBk= github.com/fumiama/water v0.0.0-20211231134027-da391938d6ac h1:A/5A0rODsg+EQHH61Ew5mMUtDpRXaSNqHhPvW+fN4C4= github.com/fumiama/water v0.0.0-20211231134027-da391938d6ac/go.mod h1:BBnNY9PwK+UUn4trAU+H0qsMEypm7+3Bj1bVFuJItlo= github.com/fumiama/wintun v0.0.0-20211229152851-8bc97c8034c0 h1:WfrSFlIlCAtg6Rt2IGna0HhJYSDE45YVHiYqO4wwsEw= @@ -17,12 +18,15 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 h1:TG/diQgUe0pntT/2D9tmUCz4VNwm9MfrtPr0SU2qSX8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/wdvxdr1123/ZeroBot v1.5.0-mid.0.20220415071800-9e52436ab5c0 h1:SoNu5MZZsbleecVCBth/s610wLXWKIr18KADhZURCDw= github.com/wdvxdr1123/ZeroBot v1.5.0-mid.0.20220415071800-9e52436ab5c0/go.mod h1:K2vu0mslV8s4qhIAu/a03Z7YW24qjM0j3imIR+k21KI= -golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -36,5 +40,6 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/gold/link/link.go b/gold/link/link.go index fad0973..f628094 100644 --- a/gold/link/link.go +++ b/gold/link/link.go @@ -64,7 +64,7 @@ func (l *Link) Destroy() { func (l *Link) String() (n string) { n = "default" if l.pubk != nil { - b, err := base14.UTF16be2utf8(base14.Encode(l.pubk[:7])) + b, err := base14.UTF16BE2UTF8(base14.Encode(l.pubk[:7])) if err == nil { n = helper.BytesToString(b) } else { diff --git a/main.go b/main.go index 11723b2..464c024 100644 --- a/main.go +++ b/main.go @@ -38,11 +38,11 @@ func main() { if err != nil { panic(err) } - pubk, err := base14.UTF16be2utf8(base14.Encode((*k.Public())[:])) + pubk, err := base14.UTF16BE2UTF8(base14.Encode((*k.Public())[:])) if err != nil { panic(err) } - prvk, err := base14.UTF16be2utf8(base14.Encode((*k.Private())[:])) + prvk, err := base14.UTF16BE2UTF8(base14.Encode((*k.Private())[:])) if err != nil { panic(err) } diff --git a/upper/services/wg/wg.go b/upper/services/wg/wg.go index 6b8bbba..19407c8 100644 --- a/upper/services/wg/wg.go +++ b/upper/services/wg/wg.go @@ -28,7 +28,7 @@ func NewWireGold(c *config.Config) (wg WG, err error) { wg.c = c var k []byte - k, err = base14.UTF82utf16be(helper.StringToBytes(c.PrivateKey + suffix32)) + k, err = base14.UTF82UTF16BE(helper.StringToBytes(c.PrivateKey + suffix32)) if err != nil { return } @@ -39,7 +39,7 @@ func NewWireGold(c *config.Config) (wg WG, err error) { } cur := curve.Get(wg.key[:]) - pubk, err := base14.UTF16be2utf8(base14.Encode((*cur.Public())[:])) + pubk, err := base14.UTF16BE2UTF8(base14.Encode((*cur.Public())[:])) if err != nil { return } @@ -101,7 +101,7 @@ func (wg *WG) init(srcport, dstport, mtu uint16) { for _, peer := range wg.c.Peers { var peerkey [32]byte - k, err := base14.UTF82utf16be(helper.StringToBytes(peer.PublicKey + suffix32)) + k, err := base14.UTF82UTF16BE(helper.StringToBytes(peer.PublicKey + suffix32)) if err != nil { panic(err) }