crypto/ecdsa: properly truncate P-521 hashes

Before, if a hash was exactly 66 bytes long, we weren't truncating it
for use with P-521, because the byte length was not overflowing.
However, the bit length could still overflow.

Fixes #60741

Change-Id: I37a0ee210add0eb566e6dc1c141e83e992983eb6
Reviewed-on: https://go-review.googlesource.com/c/go/+/502478
Auto-Submit: Filippo Valsorda <filippo@golang.org>
Reviewed-by: Roland Shoemaker <roland@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Filippo Valsorda <filippo@golang.org>
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Filippo Valsorda 2023-06-12 18:58:50 +02:00 committed by Gopher Robot
parent bce7aec3cd
commit 886fba5871
2 changed files with 16 additions and 1 deletions

View File

@ -380,7 +380,7 @@ func hashToNat[Point nistPoint[Point]](c *nistCurve[Point], e *bigmod.Nat, hash
// an integer modulo N. This is the absolute worst of all worlds: we still
// have to reduce, because the result might still overflow N, but to take
// the left-most bits for P-521 we have to do a right shift.
if size := c.N.Size(); len(hash) > size {
if size := c.N.Size(); len(hash) >= size {
hash = hash[:size]
if excess := len(hash)*8 - c.N.BitLen(); excess > 0 {
hash = bytes.Clone(hash)

View File

@ -9,6 +9,7 @@ import (
"bytes"
"compress/bzip2"
"crypto/elliptic"
"crypto/internal/bigmod"
"crypto/rand"
"crypto/sha1"
"crypto/sha256"
@ -398,6 +399,20 @@ func testRandomPoint[Point nistPoint[Point]](t *testing.T, c *nistCurve[Point])
}
}
func TestHashToNat(t *testing.T) {
t.Run("P-224", func(t *testing.T) { testHashToNat(t, p224()) })
t.Run("P-256", func(t *testing.T) { testHashToNat(t, p256()) })
t.Run("P-384", func(t *testing.T) { testHashToNat(t, p384()) })
t.Run("P-521", func(t *testing.T) { testHashToNat(t, p521()) })
}
func testHashToNat[Point nistPoint[Point]](t *testing.T, c *nistCurve[Point]) {
for l := 0; l < 600; l++ {
h := bytes.Repeat([]byte{0xff}, l)
hashToNat(c, bigmod.NewNat(), h)
}
}
func TestZeroSignature(t *testing.T) {
testAllCurves(t, testZeroSignature)
}