From c9b906fa6278b9a9439049257a5c3e98971bdbc0 Mon Sep 17 00:00:00 2001 From: lukechampine Date: Wed, 24 Aug 2022 17:05:35 -0400 Subject: [PATCH] mod: Update to filippo.io/edwards25519@v1.0.0 --- ed25519hash/batch.go | 4 ++-- ed25519hash/ed25519.go | 8 ++++---- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ed25519hash/batch.go b/ed25519hash/batch.go index 7c27ccc..18ac06e 100644 --- a/ed25519hash/batch.go +++ b/ed25519hash/batch.go @@ -99,7 +99,7 @@ func VerifyBatch(keys []ed25519.PublicKey, hashes [][32]byte, sigs [][]byte) boo copy(buf[32:], keys[i]) copy(buf[64:], hashes[i][:]) hram := sha512.Sum512(buf) - k := new(edwards25519.Scalar).SetUniformBytes(hram[:]) + k, _ := new(edwards25519.Scalar).SetUniformBytes(hram[:]) Acoeffs[i].Multiply(Rcoeffs[i], k) } @@ -164,7 +164,7 @@ func VerifySingleKeyBatch(pub ed25519.PublicKey, hashes [][32]byte, sigs [][]byt copy(buf[32:], pub) copy(buf[64:], hashes[i][:]) hram := sha512.Sum512(buf) - k := new(edwards25519.Scalar).SetUniformBytes(hram[:]) + k, _ := new(edwards25519.Scalar).SetUniformBytes(hram[:]) Acoeff.MultiplyAdd(Rcoeffs[i], k, Acoeff) } Bcoeff.Negate(Bcoeff) diff --git a/ed25519hash/ed25519.go b/ed25519hash/ed25519.go index ffd576e..025743b 100644 --- a/ed25519hash/ed25519.go +++ b/ed25519hash/ed25519.go @@ -33,7 +33,7 @@ func Verify(pub ed25519.PublicKey, hash crypto.Hash, sig []byte) bool { copy(buf[32:], pub) copy(buf[64:], hash[:]) hramDigest := sha512.Sum512(buf) - hramDigestReduced := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:]) + hramDigestReduced, _ := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:]) b, err := new(edwards25519.Scalar).SetCanonicalBytes(sig[32:]) if err != nil { @@ -56,21 +56,21 @@ func sign(signature []byte, priv ed25519.PrivateKey, hash crypto.Hash) []byte { } keyDigest := sha512.Sum512(priv[:32]) - expandedSecretKey := new(edwards25519.Scalar).SetBytesWithClamping(keyDigest[:32]) + expandedSecretKey, _ := new(edwards25519.Scalar).SetBytesWithClamping(keyDigest[:32]) buf := make([]byte, 96) copy(buf[:32], keyDigest[32:]) copy(buf[32:], hash[:]) messageDigest := sha512.Sum512(buf[:64]) - messageDigestReduced := new(edwards25519.Scalar).SetUniformBytes(messageDigest[:]) + messageDigestReduced, _ := new(edwards25519.Scalar).SetUniformBytes(messageDigest[:]) encodedR := new(edwards25519.Point).ScalarBaseMult(messageDigestReduced).Bytes() copy(buf[:32], encodedR[:]) copy(buf[32:], priv[32:]) copy(buf[64:], hash[:]) hramDigest := sha512.Sum512(buf[:96]) - hramDigestReduced := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:]) + hramDigestReduced, _ := new(edwards25519.Scalar).SetUniformBytes(hramDigest[:]) s := hramDigestReduced.MultiplyAdd(hramDigestReduced, expandedSecretKey, messageDigestReduced) diff --git a/go.mod b/go.mod index ee16cae..e967d24 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 retract [v1.13.0, v1.13.1] // pushed accidentally require ( - filippo.io/edwards25519 v1.0.0-beta.2 + filippo.io/edwards25519 v1.0.0 github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da gitlab.com/NebulousLabs/encoding v0.0.0-20200604091946-456c3dc907fe gitlab.com/NebulousLabs/log v0.0.0-20200604091839-0ba4a941cdc2 diff --git a/go.sum b/go.sum index 590908d..4fc7f06 100644 --- a/go.sum +++ b/go.sum @@ -1,6 +1,6 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI= -filippo.io/edwards25519 v1.0.0-beta.2/go.mod h1:X+pm78QAUPtFLi1z9PYIlS/bdDnvbCOGKtZ+ACWEf7o= +filippo.io/edwards25519 v1.0.0 h1:0wAIcmJUqRdI8IJ/3eGi5/HwXZWPujYXXlkrQogz0Ek= +filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=