diff options
| author | Filippo Valsorda <filippo@golang.org> | 2018-06-08 18:28:11 -0400 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2018-06-08 18:43:33 -0400 |
| commit | a4b7722ffaa031d1ae7b95a0565c02889de22520 (patch) | |
| tree | ad4e3e3d35d3d7d7fdf3d4f6b2c203aa447ec2c0 /src/crypto/ecdsa/ecdsa.go | |
| parent | 18db93d7e673b72628e5b277b5be87f4f78135f6 (diff) | |
| parent | 289ab30457a73d29462d584a499fcf48a6aa7fa5 (diff) | |
| download | go-a4b7722ffaa031d1ae7b95a0565c02889de22520.tar.gz go-a4b7722ffaa031d1ae7b95a0565c02889de22520.zip | |
[dev.boringcrypto] all: merge master into dev.boringcrypto
Conflicts due to randutil.MaybeReadByte (kept at the top for patch
maintainability and consistency):
src/crypto/ecdsa/ecdsa.go
src/crypto/rsa/pkcs1v15.go
src/crypto/rsa/rsa.go
Change-Id: I03a2de541e68a1bbdc48590ad7c01fbffbbf4a2b
Diffstat (limited to 'src/crypto/ecdsa/ecdsa.go')
| -rw-r--r-- | src/crypto/ecdsa/ecdsa.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/crypto/ecdsa/ecdsa.go b/src/crypto/ecdsa/ecdsa.go index 6a47cc7d98..bae3f03e5d 100644 --- a/src/crypto/ecdsa/ecdsa.go +++ b/src/crypto/ecdsa/ecdsa.go @@ -28,6 +28,8 @@ import ( "io" "math/big" "unsafe" + + "crypto/internal/randutil" ) // A invertible implements fast inverse mod Curve.Params().N @@ -176,6 +178,8 @@ var errZeroParam = errors.New("zero parameter") // returns the signature as a pair of integers. The security of the private key // depends on the entropy of rand. func Sign(rand io.Reader, priv *PrivateKey, hash []byte) (r, s *big.Int, err error) { + randutil.MaybeReadByte(rand) + if boring.Enabled && rand == boring.RandReader { b, err := boringPrivateKey(priv) if err != nil { |