Skip to content

Commit

Permalink
mod: Update to filippo.io/[email protected]
Browse files Browse the repository at this point in the history
  • Loading branch information
lukechampine committed Aug 24, 2022
1 parent 7d27434 commit c9b906f
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ed25519hash/batch.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ed25519hash/ed25519.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -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=
Expand Down

0 comments on commit c9b906f

Please sign in to comment.