diff options
| author | bill_ofarrell <billo@ca.ibm.com> | 2019-10-15 19:30:54 -0400 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2019-10-16 03:09:29 +0000 |
| commit | 86f40a2e03580091ef8d2d0365ad01f2ea206ed9 (patch) | |
| tree | 79ed2a3c81cb5c451056894728875f2a1513d7d4 | |
| parent | c4817f5d4f64f65d65fbd78145fb2bf8e80b6e5f (diff) | |
| download | go-86f40a2e03580091ef8d2d0365ad01f2ea206ed9.tar.xz | |
crypto/ecdsa: fix buffer size on s390x for ecdsa
I used too small a size for buffers, which can cause a panic in some testing.
The new buffer size is generous and sufficient for all purposes.
Fixes #34927
Fixes #34928
Change-Id: Icdbbfed5da87fe3757be40dfd23182b37ec62d58
Reviewed-on: https://go-review.googlesource.com/c/go/+/201317
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
| -rw-r--r-- | src/crypto/ecdsa/ecdsa_s390x.go | 6 | ||||
| -rw-r--r-- | src/crypto/ecdsa/ecdsa_s390x.s | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/crypto/ecdsa/ecdsa_s390x.go b/src/crypto/ecdsa/ecdsa_s390x.go index f07c3bf50c..485f5fe971 100644 --- a/src/crypto/ecdsa/ecdsa_s390x.go +++ b/src/crypto/ecdsa/ecdsa_s390x.go @@ -15,7 +15,7 @@ import ( // s390x accelerated signatures //go:noescape -func kdsaSig(fc uint64, block *[1720]byte) (errn uint64) +func kdsaSig(fc uint64, block *[4096]byte) (errn uint64) type signverify int @@ -109,7 +109,7 @@ func zeroExtendAndCopy(dst, src []byte, size int) { func sign(priv *PrivateKey, csprng *cipher.StreamReader, c elliptic.Curve, e *big.Int) (r, s *big.Int, err error) { var bo bufferOffsets if canUseKDSA(signing, c, &bo) && e.Sign() != 0 { - var buffer [1720]byte + var buffer [4096]byte for { var k *big.Int k, err = randFieldElement(c, csprng) @@ -140,7 +140,7 @@ func sign(priv *PrivateKey, csprng *cipher.StreamReader, c elliptic.Curve, e *bi func verify(pub *PublicKey, c elliptic.Curve, e, r, s *big.Int) bool { var bo bufferOffsets if canUseKDSA(verifying, c, &bo) && e.Sign() != 0 { - var buffer [1720]byte + var buffer [4096]byte zeroExtendAndCopy(buffer[bo.offsetR:], r.Bytes(), bo.baseSize) zeroExtendAndCopy(buffer[bo.offsetS:], s.Bytes(), bo.baseSize) zeroExtendAndCopy(buffer[bo.offsetHash:], e.Bytes(), bo.hashSize) diff --git a/src/crypto/ecdsa/ecdsa_s390x.s b/src/crypto/ecdsa/ecdsa_s390x.s index 6ee00ce79c..c064400709 100644 --- a/src/crypto/ecdsa/ecdsa_s390x.s +++ b/src/crypto/ecdsa/ecdsa_s390x.s @@ -4,7 +4,7 @@ #include "textflag.h" -// func kdsaSig(fc uint64, block *[1720]byte) (errn uint64) +// func kdsaSig(fc uint64, block *[4096]byte) (errn uint64) TEXT ·kdsaSig(SB), NOSPLIT|NOFRAME, $0-24 MOVD fc+0(FP), R0 // function code MOVD block+8(FP), R1 // address parameter block |