sarah
/
ristretto255
mirror of https://github.com/gtank/ristretto255
1
0
Fork 0
Code Issues Releases Wiki Activity

ristretto255: minor cleanups

This commit is contained in:
Filippo Valsorda 2019-05-12 04:55:40 -04:00
parent 0e06c64ad7
commit 2b6c50d1bd
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ristretto255.go
View File

@ -21,6 +21,7 @@ import (
"github.com/gtank/ristretto255/internal/scalar"
)
// Constants from draft-hdevalence-cfrg-ristretto-01, Section 3.1.
var (
sqrtM1 = fieldElementFromDecimal(
"19681161376707505956807079304988542015446066515923890162744021073123829784752")
@ -32,8 +33,6 @@ var (
"1159843021668779879193775521855586647937357759715417654439879720876111806838")
dMinusOneSQ = fieldElementFromDecimal(
"40440834346308536858101042469323190826248399146238708352240133220865137265952")
errInvalidEncoding = errors.New("invalid Ristretto encoding")
)
// Element is an element of the ristretto255 prime-order group.
@ -203,6 +202,8 @@ func (e *Element) Encode(b []byte) []byte {
return s.Bytes(b)
}
var errInvalidEncoding = errors.New("invalid Ristretto encoding")
// Decode sets e to the decoded value of in. If in is not a 32 byte canonical
// encoding, Decode returns an error, and the receiver is unchanged.
func (e *Element) Decode(in []byte) error {

26
ristretto255_test.go
View File

@ -6,7 +6,6 @@ import (
"encoding/hex"
"testing"
"github.com/gtank/ristretto255/internal/edwards25519"
"github.com/gtank/ristretto255/internal/radix51"
)
@ -25,8 +24,8 @@ type sqrtRatioTest struct {
negative int
}
// These tests can be found in curve25519-dalek's 'field.rs'
func TestSqrtRatioM1(t *testing.T) {
// These tests can be found in curve25519-dalek's 'field.rs'
var (
zero, one = radix51.Zero, radix51.One
@ -66,18 +65,8 @@ func TestSqrtRatioM1(t *testing.T) {
}
}
var (
// The encoding of Ristretto element that can be represented internally by the Curve25519 base point.
compressedRistrettoBasepoint, _ = hex.DecodeString("e2f2ae0a6abc4e71a884a961c500515f58e30b6aa582dd8db6a65945e08d2d76")
// The representative Ristretto basepoint in extended coordinates.
ristrettoBasepoint = Element{r: edwards25519.ProjP3{
X: radix51.FieldElement([5]uint64{426475514619346, 2063872706840040, 14628272888959, 107677749330612, 288339085807592}),
Y: radix51.FieldElement([5]uint64{1934594822876571, 2049809580636559, 1991994783322914, 1758681962032007, 380046701118659}),
Z: radix51.FieldElement([5]uint64{1, 0, 0, 0, 0}),
T: radix51.FieldElement([5]uint64{410445769351754, 2235400917701188, 1495825632738689, 1351628537510093, 430502003771208}),
}}
)
// The encoding of the canonical generator.
var compressedRistrettoBasepoint, _ = hex.DecodeString("e2f2ae0a6abc4e71a884a961c500515f58e30b6aa582dd8db6a65945e08d2d76")
func TestRistrettoBasepointRoundTrip(t *testing.T) {
decodedBasepoint := &Element{}
@ -86,7 +75,8 @@ func TestRistrettoBasepointRoundTrip(t *testing.T) {
t.Fatal(err)
}
if decodedBasepoint.Equal(&ristrettoBasepoint) != 1 {
ristrettoBasepoint := (&Element{}).Base()
if decodedBasepoint.Equal(ristrettoBasepoint) != 1 {
t.Error("decode succeeded, but got wrong point")
}
@ -128,8 +118,8 @@ func TestRistrettoSmallMultiplesTestVectors(t *testing.T) {
"e0c418f7c8d9c4cdd7395b93ea124f3ad99021bb681dfc3302a9d99a2e53e64e",
}
basepointMultiple := Element{}
basepointMultiple.Zero()
basepointMultiple := (&Element{}).Zero()
ristrettoBasepoint := (&Element{}).Base()
for i := range testVectors {
// Grab the bytes of the encoding
@ -160,7 +150,7 @@ func TestRistrettoSmallMultiplesTestVectors(t *testing.T) {
}
// Ensure basepointMultiple = i * B in the next iteration
basepointMultiple.Add(&basepointMultiple, &ristrettoBasepoint)
basepointMultiple.Add(basepointMultiple, ristrettoBasepoint)
}
}