From 0470453eb172e102a2e4ab6d8b31d1999bc0cabb Mon Sep 17 00:00:00 2001 From: Robin Date: Thu, 6 Jun 2024 10:46:15 +0200 Subject: [PATCH] Change import names from v3 to v4 (#519) --- README.md | 6 +-- encrypt/ecies/ecies.go | 4 +- encrypt/ecies/ecies_test.go | 10 ++--- encrypt/ibe/ibe.go | 8 ++-- encrypt/ibe/ibe_test.go | 8 ++-- examples/bn256_enc_test.go | 8 ++-- examples/dh_test.go | 4 +- examples/enc_test.go | 6 +-- examples/neff_shuffle_test.go | 8 ++-- examples/sig_test.go | 4 +- go.mod | 2 +- go.sum | 1 + group/curve25519/basic.go | 6 +-- group/curve25519/basic_test.go | 2 +- group/curve25519/curve.go | 6 +-- group/curve25519/curve_test.go | 4 +- group/curve25519/ext.go | 6 +-- group/curve25519/param.go | 2 +- group/curve25519/proj.go | 6 +-- group/curve25519/suite.go | 10 ++--- group/edwards25519/allowvt_test.go | 2 +- group/edwards25519/curve.go | 4 +- group/edwards25519/curve_test.go | 2 +- group/edwards25519/point.go | 4 +- group/edwards25519/scalar.go | 56 +++++++++++++----------- group/edwards25519/scalar_test.go | 4 +- group/edwards25519/suite.go | 12 +++--- group/internal/marshalling/marshal.go | 2 +- group/mod/int.go | 6 +-- group/nist/curve.go | 8 ++-- group/nist/group_test.go | 2 +- group/nist/qrsuite.go | 10 ++--- group/nist/residue.go | 8 ++-- group/nist/suite.go | 10 ++--- internal/test/scheme.go | 4 +- internal/test/threshold.go | 8 ++-- pairing/bn254/adapter.go | 2 +- pairing/bn254/adapter_test.go | 2 +- pairing/bn254/bls_test.go | 4 +- pairing/bn254/group.go | 4 +- pairing/bn254/point.go | 4 +- pairing/bn254/suite.go | 6 +-- pairing/bn254/suite_test.go | 6 +-- pairing/bn256/adapter.go | 2 +- pairing/bn256/adapter_test.go | 2 +- pairing/bn256/bls_test.go | 6 +-- pairing/bn256/group.go | 4 +- pairing/bn256/point.go | 4 +- pairing/bn256/point_test.go | 2 +- pairing/bn256/suite.go | 6 +-- pairing/bn256/suite_test.go | 6 +-- pairing/circl_bls12381/adapter.go | 2 +- pairing/circl_bls12381/adapter_test.go | 2 +- pairing/circl_bls12381/g1.go | 2 +- pairing/circl_bls12381/g2.go | 2 +- pairing/circl_bls12381/group.go | 2 +- pairing/circl_bls12381/gt.go | 2 +- pairing/circl_bls12381/scalar.go | 2 +- pairing/circl_bls12381/suite.go | 8 ++-- pairing/circl_bls12381/suite_test.go | 12 +++--- pairing/pairing.go | 2 +- proof/clique.go | 2 +- proof/deniable.go | 2 +- proof/deniable_test.go | 6 +-- proof/dleq/dleq.go | 2 +- proof/dleq/dleq_test.go | 6 +-- proof/hash.go | 2 +- proof/hash_test.go | 6 +-- proof/proof.go | 2 +- proof/proof_test.go | 10 ++--- share/dkg/pedersen/dkg.go | 10 ++--- share/dkg/pedersen/dkg_test.go | 14 +++--- share/dkg/pedersen/proto_test.go | 8 ++-- share/dkg/pedersen/structs.go | 4 +- share/dkg/rabin/dkg.go | 60 +++++++++++++------------- share/dkg/rabin/dkg_test.go | 10 ++--- share/poly.go | 2 +- share/poly_test.go | 4 +- share/pvss/pvss.go | 6 +-- share/pvss/pvss_test.go | 4 +- share/vss/pedersen/dh.go | 2 +- share/vss/pedersen/vss.go | 6 +-- share/vss/pedersen/vss_test.go | 8 ++-- share/vss/rabin/dh.go | 2 +- share/vss/rabin/vss.go | 8 ++-- share/vss/rabin/vss_test.go | 6 +-- shuffle/biffle.go | 6 +-- shuffle/biffle_test.go | 8 ++-- shuffle/pair.go | 6 +-- shuffle/sequence_test.go | 2 +- shuffle/sequences.go | 6 +-- shuffle/shuffle_test.go | 8 ++-- shuffle/simple.go | 4 +- shuffle/vartime_test.go | 2 +- sign/anon/anon.go | 2 +- sign/anon/enc.go | 4 +- sign/anon/enc_test.go | 6 +-- sign/anon/sig.go | 2 +- sign/anon/sig_test.go | 8 ++-- sign/anon/suite.go | 2 +- sign/bdn/bdn.go | 10 ++--- sign/bdn/bdn_test.go | 10 ++--- sign/bls/bls.go | 6 +-- sign/bls/bls_test.go | 8 ++-- sign/cosi/cosi.go | 2 +- sign/cosi/cosi_test.go | 10 ++--- sign/cosi/suite.go | 2 +- sign/dss/dss.go | 8 ++-- sign/dss/dss_test.go | 10 ++--- sign/eddsa/eddsa.go | 4 +- sign/eddsa/eddsa_test.go | 4 +- sign/mask.go | 4 +- sign/mask_test.go | 6 +-- sign/schnorr/schnorr.go | 4 +- sign/schnorr/schnorr_test.go | 6 +-- sign/sign.go | 4 +- sign/tbls/tbls.go | 10 ++--- sign/tbls/tbls_test.go | 8 ++-- sign/test/bls_test.go | 6 +-- suites/all.go | 8 ++-- suites/suites.go | 2 +- util/encoding/encoding.go | 2 +- util/encoding/encoding_test.go | 2 +- util/key/key.go | 2 +- util/key/key_test.go | 4 +- util/random/rand.go | 2 +- util/test/group.go | 4 +- util/test/test.go | 6 +-- xof/blake2xb/blake.go | 2 +- xof/blake2xs/blake.go | 2 +- xof/keccak/keccak.go | 2 +- xof/xof_test.go | 8 ++-- 132 files changed, 392 insertions(+), 383 deletions(-) diff --git a/README.md b/README.md index 23dd7549e..96b6d5980 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Using the module ---------------- Kyber supports Go modules, and currently has a major version of 3, which means that -the import path is: `go.dedis.ch/kyber/v3`. +the import path is: `go.dedis.ch/kyber/v4`. Here is a basic example of getting started using it: 1. Make a new directory called “ex". Change directory to “ex" and put this in main.go: @@ -57,7 +57,7 @@ package main import ( "fmt" - "go.dedis.ch/kyber/v3/suites" + "go.dedis.ch/kyber/v4/suites" ) func main() { @@ -67,7 +67,7 @@ func main() { } ``` 2. Type “go mod init example.com/ex”. The resulting go.mod file will have no dependencies listed yet. -3. Type “go build”. The go tool will fill in the new dependencies that it find for you, i.e. "require go.dedis.ch/kyber/v3 v3.0.13”. +3. Type “go build”. The go tool will fill in the new dependencies that it find for you, i.e. "require go.dedis.ch/kyber/v4 v3.0.13”. 4. Running `./ex` will print `0000000000000000000000000000000000000000000000000000000000000000`. A note on deriving shared secrets diff --git a/encrypt/ecies/ecies.go b/encrypt/ecies/ecies.go index 16bca0714..e36b698a4 100644 --- a/encrypt/ecies/ecies.go +++ b/encrypt/ecies/ecies.go @@ -9,8 +9,8 @@ import ( "errors" "hash" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" "golang.org/x/crypto/hkdf" ) diff --git a/encrypt/ecies/ecies_test.go b/encrypt/ecies/ecies_test.go index 704bd39a5..d87ff2106 100644 --- a/encrypt/ecies/ecies_test.go +++ b/encrypt/ecies/ecies_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/curve25519" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/group/nist" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/curve25519" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/group/nist" + "go.dedis.ch/kyber/v4/util/random" ) func TestECIES(t *testing.T) { diff --git a/encrypt/ibe/ibe.go b/encrypt/ibe/ibe.go index 928cd9c9f..a3b2c748c 100644 --- a/encrypt/ibe/ibe.go +++ b/encrypt/ibe/ibe.go @@ -9,10 +9,10 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/util/random" ) type Ciphertext struct { diff --git a/encrypt/ibe/ibe_test.go b/encrypt/ibe/ibe_test.go index 13f066d00..9f9d6e904 100644 --- a/encrypt/ibe/ibe_test.go +++ b/encrypt/ibe/ibe_test.go @@ -8,10 +8,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" - bls "go.dedis.ch/kyber/v3/pairing/circl_bls12381" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" + bls "go.dedis.ch/kyber/v4/pairing/circl_bls12381" + "go.dedis.ch/kyber/v4/util/random" ) func newSetting(i uint) ( diff --git a/examples/bn256_enc_test.go b/examples/bn256_enc_test.go index 4c8f27d21..329310e5c 100644 --- a/examples/bn256_enc_test.go +++ b/examples/bn256_enc_test.go @@ -3,10 +3,10 @@ package examples import ( "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/util/random" ) func ElGamalEncryptBn256(suite pairing.Suite, pubkey kyber.Point, message []byte) ( diff --git a/examples/dh_test.go b/examples/dh_test.go index b06a13cf2..2fee3849a 100644 --- a/examples/dh_test.go +++ b/examples/dh_test.go @@ -3,8 +3,8 @@ package examples import ( "fmt" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) /* diff --git a/examples/enc_test.go b/examples/enc_test.go index 431258fa0..9be2a2575 100644 --- a/examples/enc_test.go +++ b/examples/enc_test.go @@ -3,9 +3,9 @@ package examples import ( "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/random" ) func ElGamalEncrypt(group kyber.Group, pubkey kyber.Point, message []byte) ( diff --git a/examples/neff_shuffle_test.go b/examples/neff_shuffle_test.go index fd77d8bf0..3dbef7ee6 100644 --- a/examples/neff_shuffle_test.go +++ b/examples/neff_shuffle_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - kproof "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/shuffle" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + kproof "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/shuffle" ) var suite = edwards25519.NewBlakeSHA256Ed25519() diff --git a/examples/sig_test.go b/examples/sig_test.go index 2b1ff96dd..f44786288 100644 --- a/examples/sig_test.go +++ b/examples/sig_test.go @@ -7,8 +7,8 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" ) type Suite interface { diff --git a/go.mod b/go.mod index 5afa346b6..f154deca5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module go.dedis.ch/kyber/v3 +module go.dedis.ch/kyber/v4 go 1.20 diff --git a/go.sum b/go.sum index b79f3bc6c..177ed5f28 100644 --- a/go.sum +++ b/go.sum @@ -31,6 +31,7 @@ github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8 go.dedis.ch/fixbuf v1.0.3 h1:hGcV9Cd/znUxlusJ64eAlExS+5cJDIyTyEG+otu5wQs= go.dedis.ch/fixbuf v1.0.3/go.mod h1:yzJMt34Wa5xD37V5RTdmp38cz3QhMagdGoem9anUalw= go.dedis.ch/kyber/v3 v3.0.4/go.mod h1:OzvaEnPvKlyrWyp3kGXlFdp7ap1VC6RkZDTaPikqhsQ= +go.dedis.ch/kyber/v3 v3.0.9 h1:i0ZbOQocHUjfFasBiUql5zVeC7u/vahFd96DFA8UOWk= go.dedis.ch/kyber/v3 v3.0.9/go.mod h1:rhNjUUg6ahf8HEg5HUvVBYoWY4boAafX8tYxX+PS+qg= go.dedis.ch/protobuf v1.0.5/go.mod h1:eIV4wicvi6JK0q/QnfIEGeSFNG0ZeB24kzut5+HaRLo= go.dedis.ch/protobuf v1.0.7/go.mod h1:pv5ysfkDX/EawiPqcW3ikOxsL5t+BqnV6xHSmE79KI4= diff --git a/group/curve25519/basic.go b/group/curve25519/basic.go index 048a22da9..ab0928943 100644 --- a/group/curve25519/basic.go +++ b/group/curve25519/basic.go @@ -8,9 +8,9 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" ) type basicPoint struct { diff --git a/group/curve25519/basic_test.go b/group/curve25519/basic_test.go index b5936ac6d..02286aafe 100644 --- a/group/curve25519/basic_test.go +++ b/group/curve25519/basic_test.go @@ -6,7 +6,7 @@ package curve25519 import ( "testing" - "go.dedis.ch/kyber/v3/util/test" + "go.dedis.ch/kyber/v4/util/test" ) // Test the basic implementation of the Ed25519 curve. diff --git a/group/curve25519/curve.go b/group/curve25519/curve.go index 1a690afdb..3b6e6654f 100644 --- a/group/curve25519/curve.go +++ b/group/curve25519/curve.go @@ -7,9 +7,9 @@ import ( "fmt" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" ) var zero = big.NewInt(0) diff --git a/group/curve25519/curve_test.go b/group/curve25519/curve_test.go index 898147e97..8e1402534 100644 --- a/group/curve25519/curve_test.go +++ b/group/curve25519/curve_test.go @@ -3,8 +3,8 @@ package curve25519 import ( "testing" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/test" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/test" ) var testSuite = NewBlakeSHA256Curve25519(false) diff --git a/group/curve25519/ext.go b/group/curve25519/ext.go index d6d4fdf1a..3845f4eb9 100644 --- a/group/curve25519/ext.go +++ b/group/curve25519/ext.go @@ -6,9 +6,9 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" ) type extPoint struct { diff --git a/group/curve25519/param.go b/group/curve25519/param.go index 1d460b97d..ed06c11c0 100644 --- a/group/curve25519/param.go +++ b/group/curve25519/param.go @@ -15,7 +15,7 @@ package curve25519 import ( "math/big" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4/group/mod" ) // Param defines a Twisted Edwards curve (TEC). diff --git a/group/curve25519/proj.go b/group/curve25519/proj.go index d0ea04da2..f9792741b 100644 --- a/group/curve25519/proj.go +++ b/group/curve25519/proj.go @@ -5,9 +5,9 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" ) type projPoint struct { diff --git a/group/curve25519/suite.go b/group/curve25519/suite.go index 4b0249e1d..bac251a82 100644 --- a/group/curve25519/suite.go +++ b/group/curve25519/suite.go @@ -8,10 +8,10 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // SuiteCurve25519 is the suite for the 25519 curve @@ -49,7 +49,7 @@ func (s *SuiteCurve25519) RandomStream() cipher.Stream { } // NewBlakeSHA256Curve25519 returns a cipher suite based on package -// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and Curve25519. +// go.dedis.ch/kyber/v4/xof/blake2xb, SHA-256, and Curve25519. // // If fullGroup is false, then the group is the prime-order subgroup. // diff --git a/group/edwards25519/allowvt_test.go b/group/edwards25519/allowvt_test.go index 54955b76d..3dee3a573 100644 --- a/group/edwards25519/allowvt_test.go +++ b/group/edwards25519/allowvt_test.go @@ -3,7 +3,7 @@ package edwards25519 import ( "testing" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) func TestVartime(t *testing.T) { diff --git a/group/edwards25519/curve.go b/group/edwards25519/curve.go index 379801ab3..2e0815370 100644 --- a/group/edwards25519/curve.go +++ b/group/edwards25519/curve.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "crypto/sha512" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" ) // Curve represents the Ed25519 group. diff --git a/group/edwards25519/curve_test.go b/group/edwards25519/curve_test.go index 853e46e85..a783750c5 100644 --- a/group/edwards25519/curve_test.go +++ b/group/edwards25519/curve_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.dedis.ch/kyber/v3/util/test" + "go.dedis.ch/kyber/v4/util/test" ) var tSuite = NewBlakeSHA256Ed25519() diff --git a/group/edwards25519/point.go b/group/edwards25519/point.go index 191450ee0..c4ffeea6f 100644 --- a/group/edwards25519/point.go +++ b/group/edwards25519/point.go @@ -20,8 +20,8 @@ import ( "errors" "io" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" ) var marshalPointID = [8]byte{'e', 'd', '.', 'p', 'o', 'i', 'n', 't'} diff --git a/group/edwards25519/scalar.go b/group/edwards25519/scalar.go index cd5195294..362d7c142 100644 --- a/group/edwards25519/scalar.go +++ b/group/edwards25519/scalar.go @@ -12,10 +12,10 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" ) // This code is a port of the public domain, "ref10" implementation of ed25519 @@ -195,13 +195,15 @@ func newScalarInt(i *big.Int) *scalar { } // Input: -// a[0]+256*a[1]+...+256^31*a[31] = a -// b[0]+256*b[1]+...+256^31*b[31] = b -// c[0]+256*c[1]+...+256^31*c[31] = c +// +// a[0]+256*a[1]+...+256^31*a[31] = a +// b[0]+256*b[1]+...+256^31*b[31] = b +// c[0]+256*c[1]+...+256^31*c[31] = c // // Output: -// s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l -// where l = 2^252 + 27742317777372353535851937790883648493. +// +// s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l +// where l = 2^252 + 27742317777372353535851937790883648493. func scMulAdd(s, a, b, c *[32]byte) { a0 := 2097151 & load3(a[:]) a1 := 2097151 & (load4(a[2:]) >> 5) @@ -630,13 +632,14 @@ func scMulAdd(s, a, b, c *[32]byte) { // Hacky scAdd cobbled together rather sub-optimally from scMulAdd. // // Input: -// a[0]+256*a[1]+...+256^31*a[31] = a -// c[0]+256*c[1]+...+256^31*c[31] = c +// +// a[0]+256*a[1]+...+256^31*a[31] = a +// c[0]+256*c[1]+...+256^31*c[31] = c // // Output: -// s[0]+256*s[1]+...+256^31*s[31] = (a+c) mod l -// where l = 2^252 + 27742317777372353535851937790883648493. // +// s[0]+256*s[1]+...+256^31*s[31] = (a+c) mod l +// where l = 2^252 + 27742317777372353535851937790883648493. func scAdd(s, a, c *[32]byte) { a0 := 2097151 & load3(a[:]) a1 := 2097151 & (load4(a[2:]) >> 5) @@ -1053,13 +1056,14 @@ func scAdd(s, a, c *[32]byte) { // Hacky scSub cobbled together rather sub-optimally from scMulAdd. // // Input: -// a[0]+256*a[1]+...+256^31*a[31] = a -// c[0]+256*c[1]+...+256^31*c[31] = c +// +// a[0]+256*a[1]+...+256^31*a[31] = a +// c[0]+256*c[1]+...+256^31*c[31] = c // // Output: -// s[0]+256*s[1]+...+256^31*s[31] = (a-c) mod l -// where l = 2^252 + 27742317777372353535851937790883648493. // +// s[0]+256*s[1]+...+256^31*s[31] = (a-c) mod l +// where l = 2^252 + 27742317777372353535851937790883648493. func scSub(s, a, c *[32]byte) { a0 := 2097151 & load3(a[:]) a1 := 2097151 & (load4(a[2:]) >> 5) @@ -1476,12 +1480,14 @@ func scSub(s, a, c *[32]byte) { // Hacky scMul cobbled together rather sub-optimally from scMulAdd. // // Input: -// a[0]+256*a[1]+...+256^31*a[31] = a -// b[0]+256*b[1]+...+256^31*b[31] = b +// +// a[0]+256*a[1]+...+256^31*a[31] = a +// b[0]+256*b[1]+...+256^31*b[31] = b // // Output: -// s[0]+256*s[1]+...+256^31*s[31] = (ab) mod l -// where l = 2^252 + 27742317777372353535851937790883648493. +// +// s[0]+256*s[1]+...+256^31*s[31] = (ab) mod l +// where l = 2^252 + 27742317777372353535851937790883648493. func scMul(s, a, b *[32]byte) { a0 := 2097151 & load3(a[:]) a1 := 2097151 & (load4(a[2:]) >> 5) @@ -1908,11 +1914,13 @@ func scMul(s, a, b *[32]byte) { } // Input: -// s[0]+256*s[1]+...+256^63*s[63] = s +// +// s[0]+256*s[1]+...+256^63*s[63] = s // // Output: -// s[0]+256*s[1]+...+256^31*s[31] = s mod l -// where l = 2^252 + 27742317777372353535851937790883648493. +// +// s[0]+256*s[1]+...+256^31*s[31] = s mod l +// where l = 2^252 + 27742317777372353535851937790883648493. func scReduce(out *[32]byte, s *[64]byte) { s0 := 2097151 & load3(s[:]) s1 := 2097151 & (load4(s[2:]) >> 5) diff --git a/group/edwards25519/scalar_test.go b/group/edwards25519/scalar_test.go index 5c50864a6..07d48b53c 100644 --- a/group/edwards25519/scalar_test.go +++ b/group/edwards25519/scalar_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" ) // SimpleCTScalar implements the scalar operations only using `ScMulAdd` by diff --git a/group/edwards25519/suite.go b/group/edwards25519/suite.go index aadf8ffdd..fd15f80bc 100644 --- a/group/edwards25519/suite.go +++ b/group/edwards25519/suite.go @@ -8,10 +8,10 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // SuiteEd25519 implements some basic functionalities such as Group, HashFactory, @@ -54,7 +54,7 @@ func (s *SuiteEd25519) RandomStream() cipher.Stream { } // NewBlakeSHA256Ed25519 returns a cipher suite based on package -// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and the Ed25519 curve. +// go.dedis.ch/kyber/v4/xof/blake2xb, SHA-256, and the Ed25519 curve. // It produces cryptographically random numbers via package crypto/rand. func NewBlakeSHA256Ed25519() *SuiteEd25519 { suite := new(SuiteEd25519) @@ -62,7 +62,7 @@ func NewBlakeSHA256Ed25519() *SuiteEd25519 { } // NewBlakeSHA256Ed25519WithRand returns a cipher suite based on package -// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and the Ed25519 curve. +// go.dedis.ch/kyber/v4/xof/blake2xb, SHA-256, and the Ed25519 curve. // It produces cryptographically random numbers via the provided stream r. func NewBlakeSHA256Ed25519WithRand(r cipher.Stream) *SuiteEd25519 { suite := new(SuiteEd25519) diff --git a/group/internal/marshalling/marshal.go b/group/internal/marshalling/marshal.go index f120f68cc..9d62ffc74 100644 --- a/group/internal/marshalling/marshal.go +++ b/group/internal/marshalling/marshal.go @@ -6,7 +6,7 @@ import ( "io" "reflect" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // PointMarshalTo provides a generic implementation of Point.EncodeTo diff --git a/group/mod/int.go b/group/mod/int.go index ba898f2fd..172e79a4d 100644 --- a/group/mod/int.go +++ b/group/mod/int.go @@ -9,9 +9,9 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/util/random" ) var one = big.NewInt(1) diff --git a/group/nist/curve.go b/group/nist/curve.go index 6888d9fc0..23541822c 100644 --- a/group/nist/curve.go +++ b/group/nist/curve.go @@ -7,10 +7,10 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" ) type curvePoint struct { diff --git a/group/nist/group_test.go b/group/nist/group_test.go index e60de4198..568d60026 100644 --- a/group/nist/group_test.go +++ b/group/nist/group_test.go @@ -3,7 +3,7 @@ package nist import ( "testing" - "go.dedis.ch/kyber/v3/util/test" + "go.dedis.ch/kyber/v4/util/test" ) var testQR512 = NewBlakeSHA256QR512() diff --git a/group/nist/qrsuite.go b/group/nist/qrsuite.go index 2b1fc9107..73e15f7c0 100644 --- a/group/nist/qrsuite.go +++ b/group/nist/qrsuite.go @@ -9,10 +9,10 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // QrSuite is a quadratic residue suite @@ -50,7 +50,7 @@ func (s *QrSuite) New(t reflect.Type) interface{} { } // NewBlakeSHA256QR512 returns a cipher suite based on package -// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and a residue group of +// go.dedis.ch/kyber/v4/xof/blake2xb, SHA-256, and a residue group of // quadratic residues modulo a 512-bit prime. // // This group size should be used only for testing and experimentation. diff --git a/group/nist/residue.go b/group/nist/residue.go index 27b845b07..5b2c4a60d 100644 --- a/group/nist/residue.go +++ b/group/nist/residue.go @@ -8,10 +8,10 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" ) var one = big.NewInt(1) diff --git a/group/nist/suite.go b/group/nist/suite.go index 04f6bdd83..aba2211f9 100644 --- a/group/nist/suite.go +++ b/group/nist/suite.go @@ -8,10 +8,10 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/internal/marshalling" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/internal/marshalling" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // Suite128 is the suite for P256 curve @@ -49,7 +49,7 @@ func (s *Suite128) New(t reflect.Type) interface{} { } // NewBlakeSHA256P256 returns a cipher suite based on package -// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and the NIST P-256 +// go.dedis.ch/kyber/v4/xof/blake2xb, SHA-256, and the NIST P-256 // elliptic curve. It returns random streams from Go's crypto/rand. // // The scalars created by this group implement kyber.Scalar's SetBytes diff --git a/internal/test/scheme.go b/internal/test/scheme.go index bb579ddcb..ae6fd5449 100644 --- a/internal/test/scheme.go +++ b/internal/test/scheme.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/util/random" ) // SchemeTesting tests a scheme with simple checks diff --git a/internal/test/threshold.go b/internal/test/threshold.go index 1329c9825..b56690b73 100644 --- a/internal/test/threshold.go +++ b/internal/test/threshold.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/util/random" ) // ThresholdTest performs a simple check on a threshold scheme implementation diff --git a/pairing/bn254/adapter.go b/pairing/bn254/adapter.go index 79293438a..e8116180a 100644 --- a/pairing/bn254/adapter.go +++ b/pairing/bn254/adapter.go @@ -1,7 +1,7 @@ package bn254 import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // SuiteBn254 is an adapter that implements the suites.Suite interface so that diff --git a/pairing/bn254/adapter_test.go b/pairing/bn254/adapter_test.go index 73792ff64..2419b7969 100644 --- a/pairing/bn254/adapter_test.go +++ b/pairing/bn254/adapter_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4/util/key" ) func TestAdapter_SuiteBn254(t *testing.T) { diff --git a/pairing/bn254/bls_test.go b/pairing/bn254/bls_test.go index 93d707d4c..663d735a1 100644 --- a/pairing/bn254/bls_test.go +++ b/pairing/bn254/bls_test.go @@ -3,8 +3,8 @@ package bn254 import ( "testing" - "go.dedis.ch/kyber/v3/internal/test" - "go.dedis.ch/kyber/v3/sign/bls" + "go.dedis.ch/kyber/v4/internal/test" + "go.dedis.ch/kyber/v4/sign/bls" ) func TestBLSSchemeBN254G1(t *testing.T) { diff --git a/pairing/bn254/group.go b/pairing/bn254/group.go index c26a519ca..4844a99ed 100644 --- a/pairing/bn254/group.go +++ b/pairing/bn254/group.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "encoding/hex" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" ) type groupG1 struct { diff --git a/pairing/bn254/point.go b/pairing/bn254/point.go index 866520da6..c4cea7277 100644 --- a/pairing/bn254/point.go +++ b/pairing/bn254/point.go @@ -7,8 +7,8 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" "golang.org/x/crypto/sha3" ) diff --git a/pairing/bn254/suite.go b/pairing/bn254/suite.go index 2125e16c3..f82917343 100644 --- a/pairing/bn254/suite.go +++ b/pairing/bn254/suite.go @@ -23,9 +23,9 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" "golang.org/x/crypto/sha3" ) diff --git a/pairing/bn254/suite_test.go b/pairing/bn254/suite_test.go index 03cca6bb0..113d71aec 100644 --- a/pairing/bn254/suite_test.go +++ b/pairing/bn254/suite_test.go @@ -7,9 +7,9 @@ import ( gnark_bn "github.com/consensys/gnark-crypto/ecc/bn254" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" "go.dedis.ch/protobuf" ) diff --git a/pairing/bn256/adapter.go b/pairing/bn256/adapter.go index 8df9029b5..45ed25a80 100644 --- a/pairing/bn256/adapter.go +++ b/pairing/bn256/adapter.go @@ -1,7 +1,7 @@ package bn256 import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // SuiteBn256 is an adapter that implements the suites.Suite interface so that diff --git a/pairing/bn256/adapter_test.go b/pairing/bn256/adapter_test.go index 43112fd42..e426f8f51 100644 --- a/pairing/bn256/adapter_test.go +++ b/pairing/bn256/adapter_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4/util/key" ) func TestAdapter_SuiteBn256(t *testing.T) { diff --git a/pairing/bn256/bls_test.go b/pairing/bn256/bls_test.go index 97afd22c1..83d9d8826 100644 --- a/pairing/bn256/bls_test.go +++ b/pairing/bn256/bls_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/internal/test" - "go.dedis.ch/kyber/v3/sign/bls" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4/internal/test" + "go.dedis.ch/kyber/v4/sign/bls" + "go.dedis.ch/kyber/v4/util/random" ) func TestBLSSchemeBN256G1(t *testing.T) { diff --git a/pairing/bn256/group.go b/pairing/bn256/group.go index 9ed3039cd..f4ec560bd 100644 --- a/pairing/bn256/group.go +++ b/pairing/bn256/group.go @@ -3,8 +3,8 @@ package bn256 import ( "crypto/cipher" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" ) type groupG1 struct { diff --git a/pairing/bn256/point.go b/pairing/bn256/point.go index 45210d804..48e773da6 100644 --- a/pairing/bn256/point.go +++ b/pairing/bn256/point.go @@ -8,8 +8,8 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" ) var marshalPointID1 = [8]byte{'b', 'n', '2', '5', '6', '.', 'g', '1'} diff --git a/pairing/bn256/point_test.go b/pairing/bn256/point_test.go index 8ec2c8986..3b54df9fe 100644 --- a/pairing/bn256/point_test.go +++ b/pairing/bn256/point_test.go @@ -3,7 +3,7 @@ package bn256 import ( "bytes" "encoding/hex" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4/util/random" "testing" ) diff --git a/pairing/bn256/suite.go b/pairing/bn256/suite.go index 048d981e9..03363ad04 100644 --- a/pairing/bn256/suite.go +++ b/pairing/bn256/suite.go @@ -24,9 +24,9 @@ import ( "reflect" "go.dedis.ch/fixbuf" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // Suite implements the pairing.Suite interface for the BN256 bilinear pairing. diff --git a/pairing/bn256/suite_test.go b/pairing/bn256/suite_test.go index 991744de9..a3393bb2c 100644 --- a/pairing/bn256/suite_test.go +++ b/pairing/bn256/suite_test.go @@ -6,9 +6,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/util/random" "go.dedis.ch/protobuf" "golang.org/x/crypto/bn256" ) diff --git a/pairing/circl_bls12381/adapter.go b/pairing/circl_bls12381/adapter.go index 9011d477c..e5a7745b1 100644 --- a/pairing/circl_bls12381/adapter.go +++ b/pairing/circl_bls12381/adapter.go @@ -1,7 +1,7 @@ package circl_bls12381 import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // SuiteBLS12381 is an adapter that implements the suites.Suite interface so that diff --git a/pairing/circl_bls12381/adapter_test.go b/pairing/circl_bls12381/adapter_test.go index bb76ad2a4..b9e846703 100644 --- a/pairing/circl_bls12381/adapter_test.go +++ b/pairing/circl_bls12381/adapter_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4/util/key" ) func TestAdapter_SuiteBLS12381(t *testing.T) { diff --git a/pairing/circl_bls12381/g1.go b/pairing/circl_bls12381/g1.go index d7d2395ba..09db3d61e 100644 --- a/pairing/circl_bls12381/g1.go +++ b/pairing/circl_bls12381/g1.go @@ -5,7 +5,7 @@ import ( "io" circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) var _ kyber.SubGroupElement = &G1Elt{} diff --git a/pairing/circl_bls12381/g2.go b/pairing/circl_bls12381/g2.go index e5fa72dec..9ab1a22cd 100644 --- a/pairing/circl_bls12381/g2.go +++ b/pairing/circl_bls12381/g2.go @@ -5,7 +5,7 @@ import ( "io" circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) var _ kyber.SubGroupElement = &G2Elt{} diff --git a/pairing/circl_bls12381/group.go b/pairing/circl_bls12381/group.go index a384c2ed0..c7c579b2a 100644 --- a/pairing/circl_bls12381/group.go +++ b/pairing/circl_bls12381/group.go @@ -2,7 +2,7 @@ package circl_bls12381 import ( circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) var ( diff --git a/pairing/circl_bls12381/gt.go b/pairing/circl_bls12381/gt.go index 8224d33cc..7b859f16b 100644 --- a/pairing/circl_bls12381/gt.go +++ b/pairing/circl_bls12381/gt.go @@ -5,7 +5,7 @@ import ( "io" circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) var gtBase *circl.Gt diff --git a/pairing/circl_bls12381/scalar.go b/pairing/circl_bls12381/scalar.go index 241e7ef2c..d31461b72 100644 --- a/pairing/circl_bls12381/scalar.go +++ b/pairing/circl_bls12381/scalar.go @@ -5,7 +5,7 @@ import ( "io" circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) var _ kyber.Scalar = &Scalar{} diff --git a/pairing/circl_bls12381/suite.go b/pairing/circl_bls12381/suite.go index db7c7f34e..f39593894 100644 --- a/pairing/circl_bls12381/suite.go +++ b/pairing/circl_bls12381/suite.go @@ -7,10 +7,10 @@ import ( "io" circl "github.com/cloudflare/circl/ecc/bls12381" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) var _ pairing.Suite = Suite{} diff --git a/pairing/circl_bls12381/suite_test.go b/pairing/circl_bls12381/suite_test.go index da7db5f81..0cada04f8 100644 --- a/pairing/circl_bls12381/suite_test.go +++ b/pairing/circl_bls12381/suite_test.go @@ -7,12 +7,12 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/internal/test" - this "go.dedis.ch/kyber/v3/pairing/circl_bls12381" - "go.dedis.ch/kyber/v3/sign/bls" - "go.dedis.ch/kyber/v3/sign/tbls" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/internal/test" + this "go.dedis.ch/kyber/v4/pairing/circl_bls12381" + "go.dedis.ch/kyber/v4/sign/bls" + "go.dedis.ch/kyber/v4/sign/tbls" + "go.dedis.ch/kyber/v4/util/random" ) // Code extracted from kyber/utils/test diff --git a/pairing/pairing.go b/pairing/pairing.go index 3c6f9af87..52c534e42 100644 --- a/pairing/pairing.go +++ b/pairing/pairing.go @@ -1,6 +1,6 @@ package pairing -import "go.dedis.ch/kyber/v3" +import "go.dedis.ch/kyber/v4" // Suite interface represents a triplet of elliptic curve groups (G₁, G₂ // and GT) such that there exists a function e(g₁ˣ,g₂ʸ)=gTˣʸ (where gₓ is a diff --git a/proof/clique.go b/proof/clique.go index a8f2552c9..7879ffe04 100644 --- a/proof/clique.go +++ b/proof/clique.go @@ -10,7 +10,7 @@ package proof // assumes that nodes are always "live" and never go offline, // but we can achieve availability via threshold kyber. -import "go.dedis.ch/kyber/v3" +import "go.dedis.ch/kyber/v4" // Protocol represents the role of a participant in a clique protocol. // A participant is represented as a higher-order function taking a StarContext, diff --git a/proof/deniable.go b/proof/deniable.go index 0208a393d..c76bb5650 100644 --- a/proof/deniable.go +++ b/proof/deniable.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // DeniableProver is a Protocol implementing an interactive Sigma-protocol diff --git a/proof/deniable_test.go b/proof/deniable_test.go index d654baef9..b7533cfc4 100644 --- a/proof/deniable_test.go +++ b/proof/deniable_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/random" ) var testSuite = edwards25519.NewBlakeSHA256Ed25519() diff --git a/proof/dleq/dleq.go b/proof/dleq/dleq.go index 92fcde75d..044e616b9 100644 --- a/proof/dleq/dleq.go +++ b/proof/dleq/dleq.go @@ -10,7 +10,7 @@ package dleq import ( "errors" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Suite wraps the functionalities needed by the dleq package. diff --git a/proof/dleq/dleq_test.go b/proof/dleq/dleq_test.go index e6683aa37..a33df8cbf 100644 --- a/proof/dleq/dleq_test.go +++ b/proof/dleq/dleq_test.go @@ -4,9 +4,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/random" ) var rng = random.New() diff --git a/proof/hash.go b/proof/hash.go index 8f1aa508e..95790c852 100644 --- a/proof/hash.go +++ b/proof/hash.go @@ -6,7 +6,7 @@ import ( "fmt" "io" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Hash-based noninteractive Sigma-protocol prover context diff --git a/proof/hash_test.go b/proof/hash_test.go index 60df64cd2..f2fa1d432 100644 --- a/proof/hash_test.go +++ b/proof/hash_test.go @@ -4,9 +4,9 @@ import ( "encoding/hex" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // This example shows how to build classic ElGamal-style digital signatures diff --git a/proof/proof.go b/proof/proof.go index 4d3258d8e..cb4bce6b2 100644 --- a/proof/proof.go +++ b/proof/proof.go @@ -8,7 +8,7 @@ package proof import ( "errors" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Suite defines the functionalities needed for this package to operate diff --git a/proof/proof_test.go b/proof/proof_test.go index e12f21168..314a6dd37 100644 --- a/proof/proof_test.go +++ b/proof/proof_test.go @@ -6,11 +6,11 @@ import ( "strconv" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/curve25519" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/group/nist" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/curve25519" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/group/nist" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) func TestRep(t *testing.T) { diff --git a/share/dkg/pedersen/dkg.go b/share/dkg/pedersen/dkg.go index d3a5f2735..2f3874c93 100644 --- a/share/dkg/pedersen/dkg.go +++ b/share/dkg/pedersen/dkg.go @@ -8,11 +8,11 @@ import ( "fmt" "io" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/encrypt/ecies" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/encrypt/ecies" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/util/random" ) type Suite interface { diff --git a/share/dkg/pedersen/dkg_test.go b/share/dkg/pedersen/dkg_test.go index 88484a06c..3e0d8ca32 100644 --- a/share/dkg/pedersen/dkg_test.go +++ b/share/dkg/pedersen/dkg_test.go @@ -8,13 +8,13 @@ import ( clock "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign/schnorr" - "go.dedis.ch/kyber/v3/sign/tbls" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign/schnorr" + "go.dedis.ch/kyber/v4/sign/tbls" + "go.dedis.ch/kyber/v4/util/random" ) type TestNode struct { diff --git a/share/dkg/pedersen/proto_test.go b/share/dkg/pedersen/proto_test.go index 19757a523..3990bdbeb 100644 --- a/share/dkg/pedersen/proto_test.go +++ b/share/dkg/pedersen/proto_test.go @@ -7,10 +7,10 @@ import ( clock "github.com/jonboulle/clockwork" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/schnorr" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/sign/schnorr" + "go.dedis.ch/kyber/v4/util/random" ) type TestNetwork struct { diff --git a/share/dkg/pedersen/structs.go b/share/dkg/pedersen/structs.go index 3128596a6..2c635d734 100644 --- a/share/dkg/pedersen/structs.go +++ b/share/dkg/pedersen/structs.go @@ -8,8 +8,8 @@ import ( "sort" "strings" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" ) // Index is an alias to designate the index of a node. The index is used to diff --git a/share/dkg/rabin/dkg.go b/share/dkg/rabin/dkg.go index 969044b1e..2739a944e 100644 --- a/share/dkg/rabin/dkg.go +++ b/share/dkg/rabin/dkg.go @@ -10,29 +10,29 @@ // // The protocol works as follow: // -// 1. Each participant instantiates a DistKeyShare (DKS) struct. -// 2. Then each participant runs an instance of the VSS protocol: +// 1. Each participant instantiates a DistKeyShare (DKS) struct. +// 2. Then each participant runs an instance of the VSS protocol: // - each participant generates their deals with the method `Deals()` and then -// sends them to the right recipient. +// sends them to the right recipient. // - each participant processes the received deal with `ProcessDeal()` and -// broadcasts the resulting response. +// broadcasts the resulting response. // - each participant processes the response with `ProcessResponse()`. If a -// justification is returned, it must be broadcasted. -// 3. Each participant can check if step 2. is done by calling -// `Certified()`.Those participants where Certified() returned true, belong to -// the set of "qualified" participants who will generate the distributed -// secret. To get the list of qualified participants, use QUAL(). -// 4. Each QUAL participant generates their secret commitments calling -// `SecretCommits()` and broadcasts them to the QUAL set. -// 5. Each QUAL participant processes the received secret commitments using -// `SecretCommits()`. If there is an error, it can return a commitment complaint -// (ComplaintCommits) that must be broadcasted to the QUAL set. -// 6. Each QUAL participant receiving a complaint can process it with -// `ProcessComplaintCommits()` which returns the secret share -// (ReconstructCommits) given from the malicious participant. This structure -// must be broadcasted to all the QUAL participant. -// 7. At this point, every QUAL participant can issue the distributed key by -// calling `DistKeyShare()`. +// justification is returned, it must be broadcasted. +// 3. Each participant can check if step 2. is done by calling +// `Certified()`.Those participants where Certified() returned true, belong to +// the set of "qualified" participants who will generate the distributed +// secret. To get the list of qualified participants, use QUAL(). +// 4. Each QUAL participant generates their secret commitments calling +// `SecretCommits()` and broadcasts them to the QUAL set. +// 5. Each QUAL participant processes the received secret commitments using +// `SecretCommits()`. If there is an error, it can return a commitment complaint +// (ComplaintCommits) that must be broadcasted to the QUAL set. +// 6. Each QUAL participant receiving a complaint can process it with +// `ProcessComplaintCommits()` which returns the secret share +// (ReconstructCommits) given from the malicious participant. This structure +// must be broadcasted to all the QUAL participant. +// 7. At this point, every QUAL participant can issue the distributed key by +// calling `DistKeyShare()`. package dkg import ( @@ -41,12 +41,11 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" + vss "go.dedis.ch/kyber/v4/share/vss/rabin" + "go.dedis.ch/kyber/v4/sign/schnorr" "go.dedis.ch/protobuf" - - "go.dedis.ch/kyber/v3/share" - vss "go.dedis.ch/kyber/v3/share/vss/rabin" ) // Suite wraps the functionalities needed by the dkg package @@ -79,8 +78,9 @@ func (d *DistKeyShare) Commitments() []kyber.Point { // Deal holds the Deal for one participant as well as the index of the issuing // Dealer. -// NOTE: Doing that in vss.go would be possible but then the Dealer is always -// assumed to be a member of the participants. It's only the case here. +// +// NOTE: Doing that in vss.go would be possible but then the Dealer is always +// assumed to be a member of the participants. It's only the case here. type Deal struct { // Index of the Dealer in the list of participants Index uint32 @@ -222,9 +222,9 @@ func NewDistKeyGenerator(suite Suite, longterm kyber.Scalar, participants []kybe // to which participant a deal belongs to, loop over the keys as indices in // the list of participants: // -// for i,dd := range distDeals { -// sendTo(participants[i],dd) -// } +// for i,dd := range distDeals { +// sendTo(participants[i],dd) +// } // // This method panics if it can't process its own deal. func (d *DistKeyGenerator) Deals() (map[int]*Deal, error) { diff --git a/share/dkg/rabin/dkg_test.go b/share/dkg/rabin/dkg_test.go index 5a5ecb976..2077f02e3 100644 --- a/share/dkg/rabin/dkg_test.go +++ b/share/dkg/rabin/dkg_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/share" - vss "go.dedis.ch/kyber/v3/share/vss/rabin" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/share" + vss "go.dedis.ch/kyber/v4/share/vss/rabin" + "go.dedis.ch/kyber/v4/sign/schnorr" ) var suite = edwards25519.NewBlakeSHA256Ed25519() diff --git a/share/poly.go b/share/poly.go index 101fd3a3a..93ae70be9 100644 --- a/share/poly.go +++ b/share/poly.go @@ -18,7 +18,7 @@ import ( "sort" "strings" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Some error definitions diff --git a/share/poly_test.go b/share/poly_test.go index 162ec3111..aa35fbc4b 100644 --- a/share/poly_test.go +++ b/share/poly_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" ) func TestSecretRecovery(test *testing.T) { diff --git a/share/pvss/pvss.go b/share/pvss/pvss.go index 8c8fc8cfe..c9f06e9dc 100644 --- a/share/pvss/pvss.go +++ b/share/pvss/pvss.go @@ -15,9 +15,9 @@ package pvss import ( "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/proof/dleq" - "go.dedis.ch/kyber/v3/share" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/proof/dleq" + "go.dedis.ch/kyber/v4/share" ) // Suite describes the functionalities needed by this package in order to diff --git a/share/pvss/pvss_test.go b/share/pvss/pvss_test.go index e9dfe32b5..5c4bf9531 100644 --- a/share/pvss/pvss_test.go +++ b/share/pvss/pvss_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" ) func TestPVSS(test *testing.T) { diff --git a/share/vss/pedersen/dh.go b/share/vss/pedersen/dh.go index c4e34ddce..2fc3c6b48 100644 --- a/share/vss/pedersen/dh.go +++ b/share/vss/pedersen/dh.go @@ -5,7 +5,7 @@ import ( "crypto/cipher" "hash" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" "golang.org/x/crypto/hkdf" ) diff --git a/share/vss/pedersen/vss.go b/share/vss/pedersen/vss.go index 8c64df459..af36073e3 100644 --- a/share/vss/pedersen/vss.go +++ b/share/vss/pedersen/vss.go @@ -12,9 +12,9 @@ import ( "fmt" "reflect" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign/schnorr" "go.dedis.ch/protobuf" ) diff --git a/share/vss/pedersen/vss_test.go b/share/vss/pedersen/vss_test.go index f5443e69a..2f23ad9c2 100644 --- a/share/vss/pedersen/vss_test.go +++ b/share/vss/pedersen/vss_test.go @@ -7,10 +7,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/schnorr" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/sign/schnorr" + "go.dedis.ch/kyber/v4/xof/blake2xb" "go.dedis.ch/protobuf" ) diff --git a/share/vss/rabin/dh.go b/share/vss/rabin/dh.go index 345c397d1..201d0f9ab 100644 --- a/share/vss/rabin/dh.go +++ b/share/vss/rabin/dh.go @@ -5,7 +5,7 @@ import ( "crypto/cipher" "hash" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" "golang.org/x/crypto/hkdf" ) diff --git a/share/vss/rabin/vss.go b/share/vss/rabin/vss.go index 67d6c6c98..4ea84af12 100644 --- a/share/vss/rabin/vss.go +++ b/share/vss/rabin/vss.go @@ -38,9 +38,9 @@ import ( "fmt" "reflect" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign/schnorr" "go.dedis.ch/protobuf" ) @@ -694,7 +694,7 @@ func (a *aggregator) UnsafeSetResponseDKG(idx uint32, approval bool) { // difficulty for an adversary to break secrecy. However, a too large T makes // it possible for an adversary to prevent recovery (robustness). func MinimumT(n int) int { - return (n + 1) / 2 + return (n >> 1) + 1 } func validT(t int, verifiers []kyber.Point) bool { diff --git a/share/vss/rabin/vss_test.go b/share/vss/rabin/vss_test.go index 1f33cb7f1..ceb482668 100644 --- a/share/vss/rabin/vss_test.go +++ b/share/vss/rabin/vss_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/sign/schnorr" "go.dedis.ch/protobuf" ) diff --git a/shuffle/biffle.go b/shuffle/biffle.go index af0ec72d3..035b98e4a 100644 --- a/shuffle/biffle.go +++ b/shuffle/biffle.go @@ -3,9 +3,9 @@ package shuffle import ( "crypto/cipher" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/util/random" ) func bifflePred() proof.Predicate { diff --git a/shuffle/biffle_test.go b/shuffle/biffle_test.go index c4150eaa6..7afd29012 100644 --- a/shuffle/biffle_test.go +++ b/shuffle/biffle_test.go @@ -3,10 +3,10 @@ package shuffle import ( "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) func TestBiffle(t *testing.T) { diff --git a/shuffle/pair.go b/shuffle/pair.go index 9be69550f..9e904bbf0 100644 --- a/shuffle/pair.go +++ b/shuffle/pair.go @@ -24,9 +24,9 @@ import ( "encoding/binary" "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/util/random" ) // Suite wraps the functionalities needed by the shuffle/ package. These are the diff --git a/shuffle/sequence_test.go b/shuffle/sequence_test.go index 2daaea940..5f9610819 100644 --- a/shuffle/sequence_test.go +++ b/shuffle/sequence_test.go @@ -4,7 +4,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) func TestAssertXY(t *testing.T) { diff --git a/shuffle/sequences.go b/shuffle/sequences.go index 9519f22ad..35f079549 100644 --- a/shuffle/sequences.go +++ b/shuffle/sequences.go @@ -6,9 +6,9 @@ import ( "fmt" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/util/random" ) // SequencesShuffle shuffles a sequence of ElGamal pairs based on Section 5 of diff --git a/shuffle/shuffle_test.go b/shuffle/shuffle_test.go index 822f31e30..b02371779 100644 --- a/shuffle/shuffle_test.go +++ b/shuffle/shuffle_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/proof" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/proof" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) var k = 5 diff --git a/shuffle/simple.go b/shuffle/simple.go index 7f7149815..b2fbe99ba 100644 --- a/shuffle/simple.go +++ b/shuffle/simple.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/proof" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/proof" ) // XX the Zs in front of some field names are a kludge to make them diff --git a/shuffle/vartime_test.go b/shuffle/vartime_test.go index 23d340154..3ce44c69c 100644 --- a/shuffle/vartime_test.go +++ b/shuffle/vartime_test.go @@ -3,7 +3,7 @@ package shuffle import ( "testing" - "go.dedis.ch/kyber/v3/group/nist" + "go.dedis.ch/kyber/v4/group/nist" ) func BenchmarkBiffleP256(b *testing.B) { diff --git a/sign/anon/anon.go b/sign/anon/anon.go index a22168b68..6f2afc896 100644 --- a/sign/anon/anon.go +++ b/sign/anon/anon.go @@ -2,7 +2,7 @@ package anon import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Set represents an explicit anonymity set diff --git a/sign/anon/enc.go b/sign/anon/enc.go index b7fb16350..281898ce8 100644 --- a/sign/anon/enc.go +++ b/sign/anon/enc.go @@ -4,8 +4,8 @@ import ( "crypto/subtle" "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/key" ) func header(suite Suite, X kyber.Point, x kyber.Scalar, diff --git a/sign/anon/enc_test.go b/sign/anon/enc_test.go index 7c3fbe4fa..e7d29c94d 100644 --- a/sign/anon/enc_test.go +++ b/sign/anon/enc_test.go @@ -5,9 +5,9 @@ import ( "encoding/hex" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) func ExampleEncrypt_one() { diff --git a/sign/anon/sig.go b/sign/anon/sig.go index 8cb4586c4..4ad911bf0 100644 --- a/sign/anon/sig.go +++ b/sign/anon/sig.go @@ -4,7 +4,7 @@ import ( "bytes" "errors" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // unlinkable ring signature diff --git a/sign/anon/sig_test.go b/sign/anon/sig_test.go index 7b0ffce31..672d8bed2 100644 --- a/sign/anon/sig_test.go +++ b/sign/anon/sig_test.go @@ -6,10 +6,10 @@ import ( "fmt" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // This example demonstrates signing and signature verification diff --git a/sign/anon/suite.go b/sign/anon/suite.go index b84013941..263d25a1f 100644 --- a/sign/anon/suite.go +++ b/sign/anon/suite.go @@ -1,7 +1,7 @@ package anon import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Suite represents the set of functionalities needed by the package anon. diff --git a/sign/bdn/bdn.go b/sign/bdn/bdn.go index 68a96ff22..df35331fa 100644 --- a/sign/bdn/bdn.go +++ b/sign/bdn/bdn.go @@ -14,11 +14,11 @@ import ( "errors" "math/big" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/mod" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/sign/bls" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/mod" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/sign/bls" "golang.org/x/crypto/blake2s" ) diff --git a/sign/bdn/bdn_test.go b/sign/bdn/bdn_test.go index 03c64446d..39dbc1851 100644 --- a/sign/bdn/bdn_test.go +++ b/sign/bdn/bdn_test.go @@ -5,11 +5,11 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/sign/bls" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/sign/bls" + "go.dedis.ch/kyber/v4/util/random" ) var suite = bn256.NewSuiteBn256() diff --git a/sign/bls/bls.go b/sign/bls/bls.go index c32fd3d10..f50a1ce70 100644 --- a/sign/bls/bls.go +++ b/sign/bls/bls.go @@ -17,9 +17,9 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/sign" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/sign" ) type hashablePoint interface { diff --git a/sign/bls/bls_test.go b/sign/bls/bls_test.go index ffa024edb..1cfdacda4 100644 --- a/sign/bls/bls_test.go +++ b/sign/bls/bls_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/util/random" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/util/random" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) func TestBLS(t *testing.T) { diff --git a/sign/cosi/cosi.go b/sign/cosi/cosi.go index 4b19c62a7..df61d53d8 100644 --- a/sign/cosi/cosi.go +++ b/sign/cosi/cosi.go @@ -49,7 +49,7 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Commit returns a random scalar v, generated from the given suite, diff --git a/sign/cosi/cosi_test.go b/sign/cosi/cosi_test.go index 6cabc4e43..331d8fd01 100644 --- a/sign/cosi/cosi_test.go +++ b/sign/cosi/cosi_test.go @@ -7,11 +7,11 @@ import ( "hash" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/eddsa" - "go.dedis.ch/kyber/v3/util/key" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/sign/eddsa" + "go.dedis.ch/kyber/v4/util/key" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // Specify cipher suite using AES-128, SHA512, and the Edwards25519 curve. diff --git a/sign/cosi/suite.go b/sign/cosi/suite.go index 91529379b..d562cc9b0 100644 --- a/sign/cosi/suite.go +++ b/sign/cosi/suite.go @@ -1,6 +1,6 @@ package cosi -import "go.dedis.ch/kyber/v3" +import "go.dedis.ch/kyber/v4" // Suite specifies the cryptographic building blocks required for the cosi package. type Suite interface { diff --git a/sign/dss/dss.go b/sign/dss/dss.go index 4a899d5b7..536e6a647 100644 --- a/sign/dss/dss.go +++ b/sign/dss/dss.go @@ -19,10 +19,10 @@ import ( "crypto/sha512" "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign/eddsa" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign/eddsa" + "go.dedis.ch/kyber/v4/sign/schnorr" ) // Suite represents the functionalities needed by the dss package diff --git a/sign/dss/dss_test.go b/sign/dss/dss_test.go index 4dc891a13..b5c488175 100644 --- a/sign/dss/dss_test.go +++ b/sign/dss/dss_test.go @@ -6,11 +6,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" - dkg "go.dedis.ch/kyber/v3/share/dkg/rabin" - "go.dedis.ch/kyber/v3/sign/eddsa" - "go.dedis.ch/kyber/v3/sign/schnorr" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" + dkg "go.dedis.ch/kyber/v4/share/dkg/rabin" + "go.dedis.ch/kyber/v4/sign/eddsa" + "go.dedis.ch/kyber/v4/sign/schnorr" ) var suite = edwards25519.NewBlakeSHA256Ed25519() diff --git a/sign/eddsa/eddsa.go b/sign/eddsa/eddsa.go index 0e8c9633f..798fbd256 100644 --- a/sign/eddsa/eddsa.go +++ b/sign/eddsa/eddsa.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" ) var group = new(edwards25519.Curve) diff --git a/sign/eddsa/eddsa_test.go b/sign/eddsa/eddsa_test.go index cac2f4747..eff788719 100644 --- a/sign/eddsa/eddsa_test.go +++ b/sign/eddsa/eddsa_test.go @@ -11,8 +11,8 @@ import ( "strings" "testing" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/util/random" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/sign/mask.go b/sign/mask.go index 51a0b2f44..22bc572c4 100644 --- a/sign/mask.go +++ b/sign/mask.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" ) // Mask is a bitmask of the participation to a collective signature. diff --git a/sign/mask_test.go b/sign/mask_test.go index 84a4d24eb..41c26d8c3 100644 --- a/sign/mask_test.go +++ b/sign/mask_test.go @@ -5,9 +5,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/util/key" ) const n = 17 diff --git a/sign/schnorr/schnorr.go b/sign/schnorr/schnorr.go index 0dbc0749c..b7ff7f955 100644 --- a/sign/schnorr/schnorr.go +++ b/sign/schnorr/schnorr.go @@ -18,8 +18,8 @@ import ( "errors" "fmt" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/sign" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/sign" ) // Suite represents the set of functionalities needed by the package schnorr. diff --git a/sign/schnorr/schnorr_test.go b/sign/schnorr/schnorr_test.go index f1a5cead8..32633951b 100644 --- a/sign/schnorr/schnorr_test.go +++ b/sign/schnorr/schnorr_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/sign/eddsa" - "go.dedis.ch/kyber/v3/util/key" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/sign/eddsa" + "go.dedis.ch/kyber/v4/util/key" ) func TestSchnorrSignature(t *testing.T) { diff --git a/sign/sign.go b/sign/sign.go index 0ef296813..866be3e5f 100644 --- a/sign/sign.go +++ b/sign/sign.go @@ -3,8 +3,8 @@ package sign import ( "crypto/cipher" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/share" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/share" ) // Scheme is the minimal interface for a signature scheme. diff --git a/sign/tbls/tbls.go b/sign/tbls/tbls.go index 8c2bed724..8837fd538 100644 --- a/sign/tbls/tbls.go +++ b/sign/tbls/tbls.go @@ -15,11 +15,11 @@ import ( "encoding/binary" "errors" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/pairing" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/sign" - "go.dedis.ch/kyber/v3/sign/bls" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/pairing" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/sign" + "go.dedis.ch/kyber/v4/sign/bls" ) // SigShare encodes a threshold BLS signature share Si = i || v where the 2-byte diff --git a/sign/tbls/tbls_test.go b/sign/tbls/tbls_test.go index 66b44a214..3750887c7 100644 --- a/sign/tbls/tbls_test.go +++ b/sign/tbls/tbls_test.go @@ -4,10 +4,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/internal/test" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/share" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4/internal/test" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/share" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) func TestTBLS(test *testing.T) { diff --git a/sign/test/bls_test.go b/sign/test/bls_test.go index deaa50872..687a9444e 100644 --- a/sign/test/bls_test.go +++ b/sign/test/bls_test.go @@ -3,9 +3,9 @@ package test import ( "testing" - "go.dedis.ch/kyber/v3/internal/test" - bls "go.dedis.ch/kyber/v3/pairing/circl_bls12381" - sign "go.dedis.ch/kyber/v3/sign/bls" + "go.dedis.ch/kyber/v4/internal/test" + bls "go.dedis.ch/kyber/v4/pairing/circl_bls12381" + sign "go.dedis.ch/kyber/v4/sign/bls" ) func TestBLS12381(t *testing.T) { diff --git a/suites/all.go b/suites/all.go index a8b2c94eb..bedfd45cb 100644 --- a/suites/all.go +++ b/suites/all.go @@ -1,10 +1,10 @@ package suites import ( - "go.dedis.ch/kyber/v3/group/edwards25519" - "go.dedis.ch/kyber/v3/group/nist" - "go.dedis.ch/kyber/v3/pairing/bn256" - "go.dedis.ch/kyber/v3/pairing/circl_bls12381" + "go.dedis.ch/kyber/v4/group/edwards25519" + "go.dedis.ch/kyber/v4/group/nist" + "go.dedis.ch/kyber/v4/pairing/bn256" + "go.dedis.ch/kyber/v4/pairing/circl_bls12381" ) func init() { diff --git a/suites/suites.go b/suites/suites.go index 9f9edaeb2..72d5154b7 100644 --- a/suites/suites.go +++ b/suites/suites.go @@ -8,7 +8,7 @@ import ( "errors" "strings" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Suite is the sum of all suites mix-ins in Kyber. diff --git a/util/encoding/encoding.go b/util/encoding/encoding.go index f1f86b6d1..792c088be 100644 --- a/util/encoding/encoding.go +++ b/util/encoding/encoding.go @@ -8,7 +8,7 @@ import ( "io" "strings" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // ReadHexPoint reads a point from r in hex representation. diff --git a/util/encoding/encoding_test.go b/util/encoding/encoding_test.go index a7d230a64..e8c042bc4 100644 --- a/util/encoding/encoding_test.go +++ b/util/encoding/encoding_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4/group/edwards25519" ) var s = edwards25519.NewBlakeSHA256Ed25519() diff --git a/util/key/key.go b/util/key/key.go index f77c2d20e..48c291798 100644 --- a/util/key/key.go +++ b/util/key/key.go @@ -4,7 +4,7 @@ package key import ( "crypto/cipher" - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" ) // Generator is a type that needs to implement a special case in order diff --git a/util/key/key_test.go b/util/key/key_test.go index 406032d7b..56ef6b20b 100644 --- a/util/key/key_test.go +++ b/util/key/key_test.go @@ -4,8 +4,8 @@ import ( "crypto/cipher" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/group/edwards25519" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/group/edwards25519" ) func TestNewKeyPair(t *testing.T) { diff --git a/util/random/rand.go b/util/random/rand.go index 2022503c6..982a9f512 100644 --- a/util/random/rand.go +++ b/util/random/rand.go @@ -10,7 +10,7 @@ import ( "io" "math/big" - "go.dedis.ch/kyber/v3/xof/blake2xb" + "go.dedis.ch/kyber/v4/xof/blake2xb" ) // Bits chooses a uniform random BigInt with a given maximum BitLen. diff --git a/util/test/group.go b/util/test/group.go index 1aa4cf6ba..5621dc030 100644 --- a/util/test/group.go +++ b/util/test/group.go @@ -1,8 +1,8 @@ package test import ( - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/random" ) // GroupBench is a generic benchmark suite for kyber.groups. diff --git a/util/test/test.go b/util/test/test.go index 87a5d643e..c7bf6a89a 100644 --- a/util/test/test.go +++ b/util/test/test.go @@ -5,9 +5,9 @@ import ( "crypto/cipher" "testing" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/util/key" - "go.dedis.ch/kyber/v3/util/random" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/util/key" + "go.dedis.ch/kyber/v4/util/random" ) // Suite represents the functionalities that this package can test diff --git a/xof/blake2xb/blake.go b/xof/blake2xb/blake.go index 9fcf11cc0..ba90af4e5 100644 --- a/xof/blake2xb/blake.go +++ b/xof/blake2xb/blake.go @@ -3,7 +3,7 @@ package blake2xb import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" "golang.org/x/crypto/blake2b" ) diff --git a/xof/blake2xs/blake.go b/xof/blake2xs/blake.go index e246c541e..125babbd9 100644 --- a/xof/blake2xs/blake.go +++ b/xof/blake2xs/blake.go @@ -3,7 +3,7 @@ package blake2xs import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" "golang.org/x/crypto/blake2s" ) diff --git a/xof/keccak/keccak.go b/xof/keccak/keccak.go index f1f7c51aa..8dfceb458 100644 --- a/xof/keccak/keccak.go +++ b/xof/keccak/keccak.go @@ -3,7 +3,7 @@ package keccak import ( - "go.dedis.ch/kyber/v3" + "go.dedis.ch/kyber/v4" "golang.org/x/crypto/sha3" ) diff --git a/xof/xof_test.go b/xof/xof_test.go index 655406732..3a7c8c957 100644 --- a/xof/xof_test.go +++ b/xof/xof_test.go @@ -7,10 +7,10 @@ import ( "testing" "github.com/stretchr/testify/require" - "go.dedis.ch/kyber/v3" - "go.dedis.ch/kyber/v3/xof/blake2xb" - "go.dedis.ch/kyber/v3/xof/blake2xs" - "go.dedis.ch/kyber/v3/xof/keccak" + "go.dedis.ch/kyber/v4" + "go.dedis.ch/kyber/v4/xof/blake2xb" + "go.dedis.ch/kyber/v4/xof/blake2xs" + "go.dedis.ch/kyber/v4/xof/keccak" ) type blake2xbF struct{}