diff --git a/api/client.go b/api/client.go
index cd4e6f17e07780197da3f87d2cde2b075f0b193d..41d7a63d8c034674a55e7f82b8962767f09940af 100644
--- a/api/client.go
+++ b/api/client.go
@@ -27,10 +27,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 d20eb0eab0383a0c3cba6fb06ed61a712a176fc2..d79b5f3e728600872a30f685bf9a9881ec3d5072 100644
--- a/api/client_test.go
+++ b/api/client_test.go
@@ -21,8 +21,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 22b3f3c2d55c6449a782c833c830d6075d7f1252..82be0622881d5f778263e1516389fa8ab77627ef 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 c3c72945ad065f35814ac7c905f87a316aa247a1..f283f7e558fc28d41a0749a97ba2a5794d707b09 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 c01b5a2827e6a9b9ba696dcfc402e0e46acb0822..3eb4ad02781a04b3cc41b3709eb7e234e96e006b 100644
--- a/api/private.go
+++ b/api/private.go
@@ -21,9 +21,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 514a19a500da8b0c04cfc5d16b6e0a5065590709..54e1e7da96ce010704a32617f8cf4bb64fae7f37 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 9103b8b0c9c0f196dbfe86c2073f9c557162133a..08302c477c45dd135be8e17185c20fab31e1cd7c 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"
"os"
diff --git a/bindings/client_test.go b/bindings/client_test.go
index f4d8bb1d00770a5c0b935b44a34d5830b95c156e..90c0a01ba26efcb7431a1f894d2c3f95039c4a91 100644
--- a/bindings/client_test.go
+++ b/bindings/client_test.go
@@ -24,9 +24,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 ed8473d5521f96dbd7ec8afe1f8aae18268645f3..6f509c5b32d7b9124ebbbb630b5b1de8fce0d4bc 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -21,9 +21,9 @@ import (
"gitlab.com/elixxir/client/io"
"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/go.mod b/go.mod
index ecae5105ff729de19564b50d63594052c7318bbe..653c7dd5311fd3d6d81fef1c5e774d757db58472 100644
--- a/go.mod
+++ b/go.mod
@@ -16,10 +16,11 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/spf13/viper v1.6.2
gitlab.com/elixxir/comms v0.0.0-20200813225502-e879259ca741
- gitlab.com/elixxir/crypto v0.0.0-20200819000020-020937ea25db
+ gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4
gitlab.com/elixxir/ekv v0.1.1
gitlab.com/elixxir/primitives v0.0.0-20200812191102-31c01f08b4dc
- gitlab.com/xx_network/comms v0.0.0-20200818182121-732dd75b1947
+ gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca
+ gitlab.com/xx_network/crypto v0.0.0-20200806235322-ede3c15881ce
gitlab.com/xx_network/primitives v0.0.0-20200812183720-516a65a4a9b2
gitlab.com/xx_network/ring v0.0.2
golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de
diff --git a/go.sum b/go.sum
index 3e57ab4c7033015540645942bd55b105a71aa0ef..23dce41453c562a07c5a1600a4fc2d3e4da8fc4b 100644
--- a/go.sum
+++ b/go.sum
@@ -170,12 +170,10 @@ gitlab.com/elixxir/crypto v0.0.0-20200804182833-984246dea2c4/go.mod h1:ucm9SFKJo
gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d h1:3+o6r8a0o9/HIpBzlGCCiwuPN8OdEX3cHzdnCNqKDAw=
gitlab.com/elixxir/crypto v0.0.0-20200805174804-bdf909f2a16d/go.mod h1:cu6uNoANVLV0J6HyTL6KqVtVyh9SHU1RjJhytYlsbVQ=
gitlab.com/elixxir/crypto v0.0.0-20200806211835-b8ce4472f399/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo=
+gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4 h1:KlaR5JBxj3oSxSsL3Rax2Rt494sxldM0hxzlr+fBy34=
gitlab.com/elixxir/crypto v0.0.0-20200811195343-de268a55c7c4/go.mod h1:LthCESQ1AfV1H26URYL9kr+XgXXCE7JfEEPpomFPxIo=
-gitlab.com/elixxir/crypto v0.0.0-20200819000020-020937ea25db h1:1TWIk/c0FOUc2uVxEodkkKlig4ZRHMODBLMoW/r2kxU=
-gitlab.com/elixxir/crypto v0.0.0-20200819000020-020937ea25db/go.mod h1:SpcmFZ4baOMRxH7qo2myvYFNr8/bz9ItYzVo5Q2Ld1k=
gitlab.com/elixxir/ekv v0.1.1 h1:Em3rF8sv+tNbQGXbcpYzAS2blWRAP708JGhYlkN74Kg=
gitlab.com/elixxir/ekv v0.1.1/go.mod h1:bXY0kgbV5BHYda4YY5/hiG5bjimGK+R3PYub5yM9C/s=
-gitlab.com/elixxir/primitives v0.0.0-20200608222556-1d2c04e59346/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d h1:OKWTmYN5q8XVHo8JXThIH0TCuvl/fLXR7MGVacpqfRg=
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d/go.mod h1:OQgUZq7SjnE0b+8+iIAT2eqQF+2IFHn73tOo+aV11mg=
gitlab.com/elixxir/primitives v0.0.0-20200804170709-a1896d262cd9 h1:o0P00afLOlI3/98DR3G5IfGSTAO1ab/uzhPYzxE/Kcg=
@@ -191,9 +189,8 @@ gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699 h1:e9rzUjMxt/4iQ5
gitlab.com/xx_network/comms v0.0.0-20200804225654-09a9af23d699/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023 h1:fQPaxyuXyH3vl8qFlFDBEx8rlEzBnXBNy74K8ItFRM4=
gitlab.com/xx_network/comms v0.0.0-20200805174823-841427dd5023/go.mod h1:owEcxTRl7gsoM8c3RQ5KAm5GstxrJp5tn+6JfQ4z5Hw=
+gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca h1:Z1ubeattVNEdW5f4jl2KXVyEHoRKKZOV0393bg56xV0=
gitlab.com/xx_network/comms v0.0.0-20200812204124-8dc2a2a1b9ca/go.mod h1:idLzPGYig57XE7xuU93OlIF9s6NgSJj7OArQvsd5DjY=
-gitlab.com/xx_network/comms v0.0.0-20200818182121-732dd75b1947 h1:g0k4nP0o/6qkh09F9d/Fy7Ys93fkyZU+kK71JviLdMg=
-gitlab.com/xx_network/comms v0.0.0-20200818182121-732dd75b1947/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=
diff --git a/key/params_test.go b/key/params_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..daa2d304059cc0b0d93272ba8242a9dd39569dbf
--- /dev/null
+++ b/key/params_test.go
@@ -0,0 +1,25 @@
+package key
+
+// Testing file for the params.go functions
+
+import "testing"
+
+// Test that the GetDefaultParams function returns the right default data
+func Test_GetDefaultParams(t *testing.T) {
+ p := GetDefaultParams()
+ if p.MinKeys != minKeys {
+ t.Errorf("MinKeys mismatch\r\tGot: %d\r\tExpected: %d", p.MinKeys, minKeys)
+ }
+ if p.MaxKeys != maxKeys {
+ t.Errorf("MinKeys mismatch\r\tGot: %d\r\tExpected: %d", p.MaxKeys, maxKeys)
+ }
+ if p.NumRekeys != numReKeys {
+ t.Errorf("MinKeys mismatch\r\tGot: %d\r\tExpected: %d", p.NumRekeys, numReKeys)
+ }
+ if p.TTLScalar != ttlScalar {
+ t.Errorf("MinKeys mismatch\r\tGot: %d\r\tExpected: %d", p.TTLScalar, ttlScalar)
+ }
+ if p.MinNumKeys != threshold {
+ t.Errorf("MinKeys mismatch\r\tGot: %d\r\tExpected: %d", p.MinNumKeys, threshold)
+ }
+}
diff --git a/key/status_test.go b/key/status_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..991d76a9d30c121151bc2529e5da8133be3a704d
--- /dev/null
+++ b/key/status_test.go
@@ -0,0 +1,21 @@
+package key
+
+// Testing file for the status.go functions
+
+import "testing"
+
+// Test that Status_String returns the right strings for a status
+func Test_Status_String(t *testing.T) {
+ if Status(Active).String() != "Active" {
+ t.Errorf("Testing Active returned mismatch.\r\tGot: %s\r\tExpected: %s", Status(Active).String(), "Active")
+ }
+ if Status(RekeyNeeded).String() != "Rekey Needed" {
+ t.Errorf("Testing RekeyNeeded returned mismatch.\r\tGot: %s\r\tExpected: %s", Status(RekeyNeeded).String(), "Rekey Needed")
+ }
+ if Status(Empty).String() != "Empty" {
+ t.Errorf("Testing Empty returned mismatch.\r\tGot: %s\r\tExpected: %s", Status(Empty).String(), "Empty")
+ }
+ if Status(RekeyEmpty).String() != "Rekey Empty" {
+ t.Errorf("Testing RekeyEmpty returned mismatch.\r\tGot: %s\r\tExpected: %s", Status(RekeyEmpty).String(), "Rekey Empty")
+ }
+}
diff --git a/rekey/rekey_test.go b/rekey/rekey_test.go
index 43d430ec0ef9307c757b37ca737b622bcba876f5..e39432809a24b438aadeb3fb9c8d1c6f9fff148e 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 89e9bb9d02823a1c4cdf92d1ca8a1ac07b321f77..55f5744b66f7898786f6fa40c3c32904d7e6cc35 100644
--- a/user/session.go
+++ b/user/session.go
@@ -18,9 +18,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"
"io"
"sync"
diff --git a/user/session_test.go b/user/session_test.go
index 08176cf53d877d5d028ca4499f5cc3506a68ca4b..f37465d16dc283b930e0e9e704c9b83a9d3e304d 100644
--- a/user/session_test.go
+++ b/user/session_test.go
@@ -13,8 +13,8 @@ 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/crypto/signature/rsa"
"gitlab.com/xx_network/primitives/id"
"math/rand"
"reflect"
diff --git a/user/sessionv1.go b/user/sessionv1.go
index e6bfcf41666fae2067a9adabfe2beb433108c09f..9dd071acb7e0719422d5ea2e033b8a3ddba2ce48 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"
)