From 596d3df1cefc128f6ac7d442f28e1eee200d2ee8 Mon Sep 17 00:00:00 2001 From: Sydney Anne Erickson <sydney@elixxir.io> Date: Mon, 10 Aug 2020 10:47:30 -0700 Subject: [PATCH] Update to use the new xxnet crypto repo --- Makefile | 4 +++- api/client.go | 4 ++-- api/client_test.go | 2 +- api/ndf_test.go | 2 +- api/notifications_test.go | 2 +- api/private.go | 2 +- api/private_test.go | 2 +- api/register.go | 4 ++-- bindings/client_test.go | 2 +- cmd/root.go | 2 +- globals/version_vars.go | 15 ++++++++------- go.mod | 11 ++++++----- go.sum | 20 ++++++++++++++++---- rekey/rekey_test.go | 2 +- user/session.go | 2 +- user/session_test.go | 2 +- user/sessionv1.go | 2 +- version_vars.go.bak | 15 ++++++++------- 18 files changed, 56 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 9c16bd45c..d450e1775 100644 --- a/Makefile +++ b/Makefile @@ -22,13 +22,15 @@ build: update_release: GOFLAGS="" go get -u gitlab.com/elixxir/primitives@release GOFLAGS="" go get -u gitlab.com/elixxir/crypto@release + GOFLAGS="" go get -u gitlab.com/xx_network/crypto@release GOFLAGS="" go get -u gitlab.com/elixxir/comms@release GOFLAGS="" go get -u gitlab.com/xx_network/comms@release - GOFLAGS="" go get -u gitlab.com/xx_network/primitives@release + GOFLAGS="" go get -u gitlab.com/xx_network/primitives@release update_master: GOFLAGS="" go get -u gitlab.com/elixxir/primitives@master GOFLAGS="" go get -u gitlab.com/elixxir/crypto@master + GOFLAGS="" go get -u gitlab.com/xx_network/crypto@master GOFLAGS="" go get -u gitlab.com/elixxir/comms@master GOFLAGS="" go get -u gitlab.com/xx_network/comms@master GOFLAGS="" go get -u gitlab.com/xx_network/primitives@master diff --git a/api/client.go b/api/client.go index 096940e9a..6e0a5a6b5 100644 --- a/api/client.go +++ b/api/client.go @@ -25,10 +25,10 @@ import ( "gitlab.com/elixxir/client/user" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/crypto/tls" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/tls" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" goio "io" diff --git a/api/client_test.go b/api/client_test.go index eae9cc498..4e6512f7e 100644 --- a/api/client_test.go +++ b/api/client_test.go @@ -20,8 +20,8 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "reflect" "testing" diff --git a/api/ndf_test.go b/api/ndf_test.go index 22b3f3c2d..82be06228 100644 --- a/api/ndf_test.go +++ b/api/ndf_test.go @@ -11,7 +11,7 @@ import ( "crypto/rand" "encoding/base64" "fmt" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/ndf" "reflect" "testing" diff --git a/api/notifications_test.go b/api/notifications_test.go index 99cf3c5ed..0f6f086ad 100644 --- a/api/notifications_test.go +++ b/api/notifications_test.go @@ -1,7 +1,7 @@ package api import ( - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "testing" ) diff --git a/api/private.go b/api/private.go index bc0f6256f..0bec336dc 100644 --- a/api/private.go +++ b/api/private.go @@ -20,9 +20,9 @@ import ( "gitlab.com/elixxir/crypto/diffieHellman" "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/crypto/xx" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" ) diff --git a/api/private_test.go b/api/private_test.go index 514a19a50..54e1e7da9 100644 --- a/api/private_test.go +++ b/api/private_test.go @@ -9,7 +9,7 @@ import ( "bytes" "gitlab.com/elixxir/client/user" "gitlab.com/elixxir/crypto/csprng" - "gitlab.com/elixxir/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/signature/rsa" "reflect" "testing" ) diff --git a/api/register.go b/api/register.go index 407dacc23..9bd44c5e4 100644 --- a/api/register.go +++ b/api/register.go @@ -16,8 +16,8 @@ import ( "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/registration" - "gitlab.com/elixxir/crypto/signature/rsa" - "gitlab.com/elixxir/crypto/tls" + "gitlab.com/xx_network/crypto/signature/rsa" + "gitlab.com/xx_network/crypto/tls" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" "sync" diff --git a/bindings/client_test.go b/bindings/client_test.go index e27368ac1..e21e7f55a 100644 --- a/bindings/client_test.go +++ b/bindings/client_test.go @@ -22,9 +22,9 @@ import ( "gitlab.com/elixxir/comms/registration" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/connect" "gitlab.com/xx_network/comms/messages" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "gitlab.com/xx_network/primitives/ndf" "math/rand" diff --git a/cmd/root.go b/cmd/root.go index ebf02de19..6e3975705 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -20,9 +20,9 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/parse" "gitlab.com/elixxir/client/user" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/elixxir/primitives/utils" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "io/ioutil" "os" diff --git a/globals/version_vars.go b/globals/version_vars.go index e95dd6b1a..57d4bf3a9 100644 --- a/globals/version_vars.go +++ b/globals/version_vars.go @@ -1,9 +1,9 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2020-08-04 16:00:18.998691 -0700 PDT m=+0.035383254 +// 2020-08-10 10:46:23.193662 -0700 PDT m=+0.042594188 package globals -const GITVERSION = `8a10037 rerun go mod` +const GITVERSION = `4ddf4b3 Merge branch 'XX-2471/XXPrimitives' into 'release'` const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client @@ -22,13 +22,14 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 - gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 + gitlab.com/elixxir/comms v0.0.0-20200810165153-3039323b5656 + gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 - gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d + gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba + gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da - golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 + golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de gopkg.in/ini.v1 v1.52.0 // indirect ) diff --git a/go.mod b/go.mod index 7fe01e526..6dd76b781 100644 --- a/go.mod +++ b/go.mod @@ -15,13 +15,14 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 - gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 + gitlab.com/elixxir/comms v0.0.0-20200810165153-3039323b5656 + gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 - gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d + gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba + gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da - golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 + golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de gopkg.in/ini.v1 v1.52.0 // indirect ) diff --git a/go.sum b/go.sum index 4d50a28ad..47b80d119 100644 --- a/go.sum +++ b/go.sum @@ -161,10 +161,13 @@ github.com/zeebo/assert v0.0.0-20181109011804-10f827ce2ed6/go.mod h1:yssERNPivll github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0= github.com/zeebo/blake3 v0.0.4/go.mod h1:YOZo8A49yNqM0X/Y+JmDUZshJWLt1laHsNSn5ny2i34= github.com/zeebo/pcg v0.0.0-20181207190024-3cdc6b625a05/go.mod h1:Gr+78ptB0MwXxm//LBaEvBiaXY7hXJ6KGe2V32X2F6E= -gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 h1:Xpz8ToqH2fMfZRhWZ+qLRpE2LQD3ct14ciF1S4Ma5Uk= -gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62/go.mod h1:Wc6fZyP/M4sBjnzb9pRScLeqwMOCv6DRXoTOd07bO3g= +gitlab.com/elixxir/comms v0.0.0-20200810165153-3039323b5656 h1:A5S3E7EPL95s3+PGhgAiwnMaa7VcWj8/RtBur3lxdOw= +gitlab.com/elixxir/comms v0.0.0-20200810165153-3039323b5656/go.mod h1:EeS1z5wXKrnWOvR0dJlVNVv8OzuiGJz7fa6LyUeN6Q0= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 h1:28ftZDeYEko7xptCZzeFWS1Iam95dj46TWFVVlKmw6A= gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo+K0N2GwRRpaNr+tKXMIOVWzmyUD0SbOu2c= +gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ= +gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 h1:U0oQ0cZeq1Wnv+MxZcny3RkMBONphpc1ambIgGbWovs= +gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 h1:m1zDQ6UadpuMnV7nvnyR+DUXE3AisRnVjajTb1xZE4c= gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s= gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d h1:OKWTmYN5q8XVHo8JXThIH0TCuvl/fLXR7MGVacpqfRg= @@ -173,8 +176,15 @@ gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9 h1:o0P00afLOlI3 gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9/go.mod h1:p0VelQda72OzoUckr1O+vPW0AiFe0nyKQ6gYcmFSuF8= gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 h1:S1cyRivF4MywQX10K8cGXux6Pbwy5dbWhsxs56G+8hs= gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= -gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 h1:e9rzUjMxt/4iQ5AVXVgwANvbgxxXgWEbvApgd6P72jU= -gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= +gitlab.com/elixxir/primitives v0.0.0-20200804231232-ad79a9e8f113/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= +gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d h1:ky5oz0D2EmOzk2n/A6Ugwj7S1B6rftxMJwc19sjGkz8= +gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d/go.mod h1:tzdFFvb1ESmuTCOl1z6+yf6oAICDxH2NPUemVgoNLxc= +gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw= +gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba h1:7nozLSNBX0CfP53DDiDNLJx9obhYGfGf5na0/c9rMso= +gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba/go.mod h1:idLzPGYig57XE7xuU93OlIF9s6NgSJj7OArQvsd5DjY= +gitlab.com/xx_network/crypto v0.0.0-20200806202113-978fa1984bbf/go.mod h1:i0df/q6dDCBiscgD51fMoS2U2TBrm6LcyN822JmB5Tw= +gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce h1:gypNBUl2guESEv4MDgH+miwYqR4jPoWM8dLt2Zs5gIs= +gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce/go.mod h1:i0df/q6dDCBiscgD51fMoS2U2TBrm6LcyN822JmB5Tw= gitlab.com/xx_network/primitives v0.0.0-20200803231956-9b192c57ea7c/go.mod h1:wtdCMr7DPePz9qwctNoAUzZtbOSHSedcK++3Df3psjA= gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da h1:CCVslUwNC7Ul7NG5nu3ThGTSVUt1TxNRX+47f5TUwnk= gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da/go.mod h1:OK9xevzWCaPO7b1wiluVJGk7R5ZsuC7pHY5hteZFQug= @@ -193,6 +203,8 @@ golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0 h1:eIYIE7EC5/Wv5Kbz8bJPaq golang.org/x/crypto v0.0.0-20200707235045-ab33eee955e0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 h1:DZhuSZLsGlFL4CmhA8BcRA0mnthyA/nZ00AqCUo7vHg= golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de h1:ikNHVSjEfnvz6sxdSPCaPt572qowuyMDMJLLm3Db3ig= +golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/rekey/rekey_test.go b/rekey/rekey_test.go index 43d430ec0..e39432809 100644 --- a/rekey/rekey_test.go +++ b/rekey/rekey_test.go @@ -15,8 +15,8 @@ import ( "gitlab.com/elixxir/crypto/e2e" "gitlab.com/elixxir/crypto/hash" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "os" "testing" diff --git a/user/session.go b/user/session.go index 6852269ee..3a94176a0 100644 --- a/user/session.go +++ b/user/session.go @@ -18,10 +18,10 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/keyStore" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/switchboard" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "io" "sync" diff --git a/user/session_test.go b/user/session_test.go index d0a2805a2..618214f80 100644 --- a/user/session_test.go +++ b/user/session_test.go @@ -13,9 +13,9 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/crypto/cyclic" "gitlab.com/elixxir/crypto/large" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" "gitlab.com/xx_network/comms/connect" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "math/rand" "reflect" diff --git a/user/sessionv1.go b/user/sessionv1.go index e6bfcf416..9dd071acb 100644 --- a/user/sessionv1.go +++ b/user/sessionv1.go @@ -8,9 +8,9 @@ import ( "gitlab.com/elixxir/client/globals" "gitlab.com/elixxir/client/keyStore" "gitlab.com/elixxir/crypto/cyclic" - "gitlab.com/elixxir/crypto/signature/rsa" "gitlab.com/elixxir/primitives/format" "gitlab.com/elixxir/primitives/switchboard" + "gitlab.com/xx_network/crypto/signature/rsa" "gitlab.com/xx_network/primitives/id" "sync" ) diff --git a/version_vars.go.bak b/version_vars.go.bak index 2edb6b985..fc77b4330 100644 --- a/version_vars.go.bak +++ b/version_vars.go.bak @@ -1,9 +1,9 @@ // Code generated by go generate; DO NOT EDIT. // This file was generated by robots at -// 2020-08-04 16:00:18.998691 -0700 PDT m=+0.035383254 +// 2020-08-10 10:46:23.193662 -0700 PDT m=+0.042594188 package cmd -const GITVERSION = `8a10037 rerun go mod` +const GITVERSION = `4ddf4b3 Merge branch 'XX-2471/XXPrimitives' into 'release'` const SEMVER = "1.4.0" const DEPENDENCIES = `module gitlab.com/elixxir/client @@ -22,13 +22,14 @@ require ( github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.6.2 - gitlab.com/elixxir/comms v0.0.0-20200804225939-84dbe3cccc62 - gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4 + gitlab.com/elixxir/comms v0.0.0-20200810165153-3039323b5656 + gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399 gitlab.com/elixxir/ekv v0.0.0-20200729182028-159355ea5842 - gitlab.com/elixxir/primitives v0.0.0-20200804182913-788f47bded40 - gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 + gitlab.com/elixxir/primitives v0.0.0-20200805174810-86b366d1dd2d + gitlab.com/xx_network/comms v0.0.0-20200806235452-3a82720833ba + gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce gitlab.com/xx_network/primitives v0.0.0-20200804183002-f99f7a7284da - golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899 + golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de gopkg.in/ini.v1 v1.52.0 // indirect ) -- GitLab