bump to go 1.16

go.mod

@@ -0,0 +1,5 @@
+module github.com/fumiama/go-x25519
+
+go 1.16
+
+require golang.org/x/crypto v0.0.0-20210921155107-089bfa567519

go.sum

@@ -0,0 +1,8 @@
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

x25519.go

@@ -5,117 +5,70 @@ package x25519
 import (
 	"crypto/rand"
 	"io"
+	"sync"
+	"unsafe"
 
-	"github.com/agl/ed25519/extra25519"
 	"golang.org/x/crypto/curve25519"
 )
 
-// KeySize is the size of keys in bytes used in this package.
+// KEYSZ is the size of keys in bytes used in this package.
-const KeySize = 32
+const KEYSZ = 32
 
-// SecretKey is the type of Curve25519 secret keys.
+// PublicKey is the type of Curve25519 public keys.
-type SecretKey struct {
+type PublicKey = [KEYSZ]byte
-	sk []byte
+
-	pk PublicKey
+// PrivateKey is the type of Curve25519 secret keys.
-	ur []byte // uniform representative of pk
+type PrivateKey = [KEYSZ]byte
+
+// Curve is the type of Curve25519 secret keys.
+type Curve struct {
+	sk      PrivateKey
+	pk      PublicKey
+	ispkset bool
+	pkmu    sync.Mutex
 }
 
-// Bytes returns the secret key as a byte slice.
+// Private returns the secret key as a byte array pointer.
-func (k *SecretKey) Bytes() []byte { return k.sk }
+func (k *Curve) Private() *PrivateKey { return &k.sk }
 
 // Public returns the PublicKey corresponding to the secret key.
-func (k *SecretKey) Public() PublicKey {
+func (k *Curve) Public() *PublicKey {
-	if k.pk == nil {
+	if !k.ispkset {
-		var pk, sk [32]byte
+		sk := k.sk
-		copy(sk[:], k.sk)
+		var pk PublicKey
 		curve25519.ScalarBaseMult(&pk, &sk)
-		k.pk = pk[:]
+		k.pkmu.Lock()
-	}
+		if !k.ispkset {
-	return k.pk
+			k.pk = pk
-}
-
-// PublicUniform returns the uniform representative of the public key corresponding to the secret key, or nil
-// if the public key does not have a uniform representative.
-func (k *SecretKey) PublicUniform() UniformRepresentative {
-	if k.ur == nil {
-		var sk, pk, ur [32]byte
-		copy(sk[:], k.sk)
-		if extra25519.ScalarBaseMult(&pk, &ur, &sk) {
-			k.pk = pk[:]
-			k.ur = ur[:]
 		}
+		k.pkmu.Unlock()
+		k.ispkset = true
 	}
-	return k.ur
+	return &k.pk
 }
 
 // Shared computes the shared secret between our secret key and peer's public key.
-func (k *SecretKey) Shared(peer PublicKey) []byte {
+func (k *Curve) Shared(peer *PublicKey) ([]byte, error) {
-	var shared, sk, pk [32]byte
+	return curve25519.X25519(k.sk[:], (*peer)[:])
-	copy(sk[:], k.sk)
-	copy(pk[:], peer)
-	curve25519.ScalarMult(&shared, &sk, &pk)
-	return shared[:]
 }
 
-// SharedUniform computes the shared secret between our secret key and peer public key's uniform representative.
+// Get creates a PrivateKey from []byte sk and len(sk) must be 32.
-func (k *SecretKey) SharedUniform(peer UniformRepresentative) []byte {
+func Get(sk []byte) *Curve {
-	var shared, pk, sk, ur [32]byte
+	if len(sk) == KEYSZ {
-	copy(ur[:], peer)
+		k := new(Curve)
-	copy(sk[:], k.sk)
+		k.sk = *(*PrivateKey)(*(*unsafe.Pointer)(unsafe.Pointer(&sk)))
-	extra25519.RepresentativeToPublicKey(&pk, &ur)
+		return k
-	curve25519.ScalarMult(&shared, &sk, &pk)
+	}
-	return shared[:]
+	return nil
 }
 
-// NewSecretKey creates a SecretKey from byte slice sk and len(sk) must be 32.
+// New generates a secret key using entropy from random, or crypto/rand.Reader
-func NewSecretKey(sk []byte) *SecretKey {
-	k := new(SecretKey)
-	k.sk = sk
-	return k
-}
-
-// GenerateKey generates a secret key using entropy from random, or crypto/rand.Reader
 // if random is nil.
-func GenerateKey(random io.Reader) (*SecretKey, error) {
+func New(random io.Reader) (k *Curve, err error) {
 	if random == nil {
 		random = rand.Reader
 	}
-	k := new(SecretKey)
+	k = new(Curve)
-	k.sk = make([]byte, 32)
+	_, err = random.Read(k.sk[:])
-	_, err := io.ReadFull(random, k.sk)
+	return
-	return k, err
 }
-
-// GenerateKeyUniform generates a secret key whose corresponding public key has a uniform representative
-// using entropy from random, or crypto/rand.Reader if random is nil.
-func GenerateKeyUniform(random io.Reader) (*SecretKey, error) {
-	if random == nil {
-		random = rand.Reader
-	}
-	var pk, sk, ur [32]byte
-	for ok := false; !ok; ok = extra25519.ScalarBaseMult(&pk, &ur, &sk) {
-		if _, err := io.ReadFull(random, sk[:]); err != nil {
-			return nil, err
-		}
-	}
-	k := new(SecretKey)
-	k.sk = sk[:]
-	k.pk = pk[:]
-	k.ur = ur[:]
-	return k, nil
-}
-
-// UniformRepresentative is the type of Curve25519 public key uniform representatives.
-// See https://www.imperialviolet.org/2013/12/25/elligator.html
-type UniformRepresentative []byte
-
-// Public returns the curve25519 public key corresponding to the uniform presentative.
-func (u UniformRepresentative) Public() PublicKey {
-	var pk, ur [32]byte
-	copy(ur[:], u)
-	extra25519.RepresentativeToPublicKey(&pk, &ur)
-	return pk[:]
-}
-
-// PublicKey is the type of Curve25519 public keys.
-type PublicKey []byte

x25519_test.go

@@ -21,7 +21,7 @@ func TestStardardKey(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	ask := NewSecretKey(askhex)
+	ask := Get(askhex)
 	apk := ask.Public()
 	if alicePK != hex.EncodeToString(apk[:]) {
 		t.Fatal("public key failed")
@@ -32,14 +32,20 @@ func TestStardardKey(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	bsk := NewSecretKey(bskhex)
+	bsk := Get(bskhex)
 	bpk := bsk.Public()
 	if bobPK != hex.EncodeToString(bpk[:]) {
 		t.Fatal("public key failed")
 	}
 
-	s1 := ask.Shared(bpk)
+	s1, err := ask.Shared(bpk)
-	s2 := bsk.Shared(apk)
+	if err != nil {
+		t.Fatal(err)
+	}
+	s2, err := bsk.Shared(apk)
+	if err != nil {
+		t.Fatal(err)
+	}
 	if !bytes.Equal(s1, s2) {
 		t.Fatal("shared secret failed")
 	}
@@ -50,28 +56,18 @@ func TestStardardKey(t *testing.T) {
 
 func TestGenerateKey(t *testing.T) {
 	for i := 0; i < 100; i++ {
-		ourSK, _ := GenerateKey(nil)
+		ourSK, _ := New(nil)
-		theirSK, _ := GenerateKey(nil)
+		theirSK, _ := New(nil)
-		s1 := ourSK.Shared(theirSK.Public())
+		s1, err := ourSK.Shared(theirSK.Public())
-		s2 := theirSK.Shared(ourSK.Public())
+		if err != nil {
+			t.Fatal(err)
+		}
+		s2, err := theirSK.Shared(ourSK.Public())
+		if err != nil {
+			t.Fatal(err)
+		}
 		if !bytes.Equal(s1, s2) {
 			t.Fatal("computed shared secrets differs")
 		}
 	}
 }
-
-func TestUniformRepresentative(t *testing.T) {
-
-	for i := 0; i < 1; i++ {
-		k, _ := GenerateKey(nil)
-		sk, _ := GenerateKeyUniform(nil)
-		pk := sk.Public()
-		ur := sk.PublicUniform()
-		if !bytes.Equal(ur.Public(), pk) {
-			t.Fatal("public key and its uniform representative do not match")
-		}
-		if !bytes.Equal(k.Shared(sk.Public()), k.SharedUniform(sk.PublicUniform())) {
-			t.Fatalf("shared secrets do not match")
-		}
-	}
-}