From 1b964a4066f3198fbb12be95040bc9b456f43028 Mon Sep 17 00:00:00 2001 From: Russ Magee Date: Thu, 6 Feb 2020 18:56:36 -0800 Subject: [PATCH] Updated intf to cryptmt Signed-off-by: Russ Magee --- go.mod | 20 ++++++++++---------- vendor/modules.txt | 12 ++++++------ xsnet/chan.go | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index dab7a12..2bce810 100644 --- a/go.mod +++ b/go.mod @@ -7,24 +7,24 @@ require ( blitter.com/go/goutmp v1.0.2 blitter.com/go/herradurakex v1.0.0 blitter.com/go/kyber v0.0.0-20200130200857-6f2021cb88d9 - blitter.com/go/mtwist v1.0.1 + blitter.com/go/mtwist v1.0.1 // indirect blitter.com/go/newhope v0.0.0-20200130200750-192fc08a8aae blitter.com/go/wanderer v0.8.2 github.com/jameskeane/bcrypt v0.0.0-20120420032655-c3cd44c1e20f - github.com/klauspost/cpuid v1.2.2 - github.com/klauspost/reedsolomon v1.9.3 + github.com/klauspost/cpuid v1.2.2 // indirect + github.com/klauspost/reedsolomon v1.9.3 // indirect github.com/kr/pty v1.1.4 github.com/mattn/go-isatty v0.0.7 - github.com/pkg/errors v0.8.1 - github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 - github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b - github.com/tjfoc/gmsm v1.0.1 + github.com/pkg/errors v0.8.1 // indirect + github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect + github.com/templexxx/xor v0.0.0-20181023030647-4e92f724b73b // indirect + github.com/tjfoc/gmsm v1.0.1 // indirect github.com/xtaci/kcp-go v5.4.19+incompatible github.com/xtaci/lossyconn v0.0.0-20190602105132-8df528c0c9ae // indirect golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d - golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 + golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 // indirect golang.org/x/sys v0.0.0-20190902133755-9109b7679e13 - gopkg.in/hlandau/easymetric.v1 v1.0.0 - gopkg.in/hlandau/measurable.v1 v1.0.1 + gopkg.in/hlandau/easymetric.v1 v1.0.0 // indirect + gopkg.in/hlandau/measurable.v1 v1.0.1 // indirect gopkg.in/hlandau/passlib.v1 v1.0.10 ) diff --git a/vendor/modules.txt b/vendor/modules.txt index ce9a3c6..48f0fc9 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -39,19 +39,19 @@ github.com/tjfoc/gmsm/sm4 github.com/xtaci/kcp-go # golang.org/x/crypto v0.0.0-20200128174031-69ecbb4d6d5d golang.org/x/crypto/blowfish -golang.org/x/crypto/cast5 golang.org/x/crypto/pbkdf2 +golang.org/x/crypto/twofish +golang.org/x/crypto/sha3 +golang.org/x/crypto/cast5 golang.org/x/crypto/salsa20 golang.org/x/crypto/tea -golang.org/x/crypto/twofish golang.org/x/crypto/xtea -golang.org/x/crypto/blake2b -golang.org/x/crypto/internal/subtle -golang.org/x/crypto/salsa20/salsa golang.org/x/crypto/argon2 golang.org/x/crypto/bcrypt +golang.org/x/crypto/internal/subtle +golang.org/x/crypto/salsa20/salsa +golang.org/x/crypto/blake2b golang.org/x/crypto/scrypt -golang.org/x/crypto/sha3 # golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553 golang.org/x/net/ipv4 golang.org/x/net/ipv6 diff --git a/xsnet/chan.go b/xsnet/chan.go index a9758a9..9721c55 100644 --- a/xsnet/chan.go +++ b/xsnet/chan.go @@ -103,7 +103,7 @@ func (hc Conn) getStream(keymat []byte) (rc cipher.Stream, mc hash.Hash, err err rc = cipher.NewOFB(block, iv) log.Printf("[cipher BLOWFISH_64 (%d)]\n", copts) case CAlgCryptMT1: - rc = cryptmt.New(keymat) + rc = cryptmt.New(nil, nil, keymat) log.Printf("[cipher CRYPTMT1 (%d)]\n", copts) case CAlgWanderer: rc = wanderer.New(nil, nil, 1, keymat, 3, 3)