Skip to content

Commit

Permalink
full replacement as per indication golang/go#30354 (comment)
Browse files Browse the repository at this point in the history
  • Loading branch information
nikkolasg committed Dec 28, 2019
1 parent 34a525d commit 7fe8641
Show file tree
Hide file tree
Showing 102 changed files with 252 additions and 254 deletions.
4 changes: 2 additions & 2 deletions encrypt/ecies/ecies.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"errors"
"hash"

"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/util/random"
"github.com/drand/kyber"
"github.com/drand/kyber/util/random"
"golang.org/x/crypto/hkdf"
)

Expand Down
4 changes: 2 additions & 2 deletions encrypt/ecies/ecies_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.dedis.ch/kyber/v3/group/edwards25519"
"go.dedis.ch/kyber/v3/util/random"
"github.com/drand/kyber/group/edwards25519"
"github.com/drand/kyber/util/random"
)

func TestECIES(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions examples/dh_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package examples
import (
"fmt"

"go.dedis.ch/kyber/v3/group/edwards25519"
"go.dedis.ch/kyber/v3/xof/blake2xb"
"github.com/drand/kyber/group/edwards25519"
"github.com/drand/kyber/xof/blake2xb"
)

/*
Expand Down
6 changes: 3 additions & 3 deletions examples/enc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/edwards25519"
"github.com/drand/kyber/util/random"
)

func ElGamalEncrypt(group kyber.Group, pubkey kyber.Point, message []byte) (
Expand Down
4 changes: 2 additions & 2 deletions examples/sig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"errors"
"fmt"

"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/group/edwards25519"
"github.com/drand/kyber"
"github.com/drand/kyber/group/edwards25519"
)

type Suite interface {
Expand Down
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module go.dedis.ch/kyber/v3
module github.com/drand/kyber

require (
github.com/stretchr/testify v1.3.0
Expand All @@ -8,6 +8,4 @@ require (
golang.org/x/sys v0.0.0-20190124100055-b90733256f2e
)

replace go.dedis.ch/kyber/v3 => github.com/drand/kyber v3.0.11

go 1.13
6 changes: 3 additions & 3 deletions group/curve25519/basic.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
)

type basicPoint struct {
Expand Down
2 changes: 1 addition & 1 deletion group/curve25519/basic_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package curve25519
import (
"testing"

"go.dedis.ch/kyber/v3/util/test"
"github.com/drand/kyber/util/test"
)

// Test the basic implementation of the Ed25519 curve.
Expand Down
6 changes: 3 additions & 3 deletions group/curve25519/curve.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/mod"
"github.com/drand/kyber/util/random"
)

var zero = big.NewInt(0)
Expand Down
4 changes: 2 additions & 2 deletions group/curve25519/curve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package curve25519
import (
"testing"

"go.dedis.ch/kyber/v3/group/edwards25519"
"go.dedis.ch/kyber/v3/util/test"
"github.com/drand/kyber/group/edwards25519"
"github.com/drand/kyber/util/test"
)

var testSuite = NewBlakeSHA256Curve25519(false)
Expand Down
6 changes: 3 additions & 3 deletions group/curve25519/ext.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
)

type extPoint struct {
Expand Down
2 changes: 1 addition & 1 deletion group/curve25519/param.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ package curve25519
import (
"math/big"

"go.dedis.ch/kyber/v3/group/mod"
"github.com/drand/kyber/group/mod"
)

// Param defines a Twisted Edwards curve (TEC).
Expand Down
6 changes: 3 additions & 3 deletions group/curve25519/proj.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
)

type projPoint struct {
Expand Down
10 changes: 5 additions & 5 deletions group/curve25519/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/util/random"
"github.com/drand/kyber/xof/blake2xb"
)

// SuiteCurve25519 is the suite for the 25519 curve
Expand Down Expand Up @@ -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.
// github.com/drand/kyber/xof/blake2xb, SHA-256, and Curve25519.
//
// If fullGroup is false, then the group is the prime-order subgroup.
//
Expand Down
2 changes: 1 addition & 1 deletion group/edwards25519/allowvt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package edwards25519
import (
"testing"

"go.dedis.ch/kyber/v3"
"github.com/drand/kyber"
)

func TestVartime(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions group/edwards25519/curve.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"crypto/cipher"
"crypto/sha512"

"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/util/random"
"github.com/drand/kyber"
"github.com/drand/kyber/util/random"
)

// Curve represents the Ed25519 group.
Expand Down
2 changes: 1 addition & 1 deletion group/edwards25519/curve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"go.dedis.ch/kyber/v3/util/test"
"github.com/drand/kyber/util/test"
)

var tSuite = NewBlakeSHA256Ed25519()
Expand Down
4 changes: 2 additions & 2 deletions group/edwards25519/point.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"errors"
"io"

"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/group/internal/marshalling"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
)

var marshalPointID = [8]byte{'e', 'd', '.', 'p', 'o', 'i', 'n', 't'}
Expand Down
8 changes: 4 additions & 4 deletions group/edwards25519/scalar.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
"github.com/drand/kyber/util/random"
)

// This code is a port of the public domain, "ref10" implementation of ed25519
Expand Down
4 changes: 2 additions & 2 deletions group/edwards25519/scalar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"

"github.com/stretchr/testify/require"
"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/util/random"
"github.com/drand/kyber"
"github.com/drand/kyber/util/random"
)

// SimpleCTScalar implements the scalar operations only using `ScMulAdd` by
Expand Down
12 changes: 6 additions & 6 deletions group/edwards25519/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/util/random"
"github.com/drand/kyber/xof/blake2xb"
)

// SuiteEd25519 implements some basic functionalities such as Group, HashFactory,
Expand Down Expand Up @@ -54,15 +54,15 @@ 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.
// github.com/drand/kyber/xof/blake2xb, SHA-256, and the Ed25519 curve.
// It produces cryptographically random numbers via package crypto/rand.
func NewBlakeSHA256Ed25519() *SuiteEd25519 {
suite := new(SuiteEd25519)
return suite
}

// NewBlakeSHA256Ed25519WithRand returns a cipher suite based on package
// go.dedis.ch/kyber/v3/xof/blake2xb, SHA-256, and the Ed25519 curve.
// github.com/drand/kyber/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)
Expand Down
2 changes: 1 addition & 1 deletion group/internal/marshalling/marshal.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"reflect"

"go.dedis.ch/kyber/v3"
"github.com/drand/kyber"
)

// PointMarshalTo provides a generic implementation of Point.EncodeTo
Expand Down
6 changes: 3 additions & 3 deletions group/mod/int.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/util/random"
)

var one = big.NewInt(1)
Expand Down
8 changes: 4 additions & 4 deletions group/nist/curve.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
"github.com/drand/kyber/util/random"
)

type curvePoint struct {
Expand Down
2 changes: 1 addition & 1 deletion group/nist/group_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package nist
import (
"testing"

"go.dedis.ch/kyber/v3/util/test"
"github.com/drand/kyber/util/test"
)

var testQR512 = NewBlakeSHA256QR512()
Expand Down
10 changes: 5 additions & 5 deletions group/nist/qrsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/util/random"
"github.com/drand/kyber/xof/blake2xb"
)

// QrSuite is a quadratic residue suite
Expand Down Expand Up @@ -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
// github.com/drand/kyber/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.
Expand Down
8 changes: 4 additions & 4 deletions group/nist/residue.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/group/mod"
"github.com/drand/kyber/util/random"
)

var one = big.NewInt(1)
Expand Down
10 changes: 5 additions & 5 deletions group/nist/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
"github.com/drand/kyber"
"github.com/drand/kyber/group/internal/marshalling"
"github.com/drand/kyber/util/random"
"github.com/drand/kyber/xof/blake2xb"
)

// Suite128 is the suite for P256 curve
Expand Down Expand Up @@ -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
// github.com/drand/kyber/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
Expand Down
4 changes: 2 additions & 2 deletions pairing/adapter.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package pairing

import (
"go.dedis.ch/kyber/v3"
"go.dedis.ch/kyber/v3/pairing/bn256"
"github.com/drand/kyber"
"github.com/drand/kyber/pairing/bn256"
)

// SuiteBn256 is an adapter that implements the suites.Suite interface so that
Expand Down
Loading

0 comments on commit 7fe8641

Please sign in to comment.