diff options
author | Julie Qiu <julie@golang.org> | 2019-01-23 16:24:21 -0500 |
---|---|---|
committer | Julie Qiu <julie@golang.org> | 2019-01-23 16:24:21 -0500 |
commit | f8e8303f566652fc74125e50a23eab612e8fc749 (patch) | |
tree | ae9ef85b5bb1010c2f3a5cb72774cf53c8eec69d | |
parent | cbf9140f8983380d3384d77fcf6b90c928af9c24 (diff) | |
parent | 35bb62e60a7779ff82c3067903b3306ff8666471 (diff) | |
download | go-f8e8303f566652fc74125e50a23eab612e8fc749.tar.gz go-f8e8303f566652fc74125e50a23eab612e8fc749.zip |
[release-branch.go1.11] all: merge release-branch.go1.11-security into release-branch.go1.11
Change-Id: Ic59638be13c6dadeccd5974ec6cd9ef4b5b4b526
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | doc/devel/release.html | 14 | ||||
-rw-r--r-- | src/crypto/elliptic/elliptic.go | 3 |
3 files changed, 17 insertions, 2 deletions
@@ -1 +1 @@ -go1.11.4
\ No newline at end of file +go1.11.5
\ No newline at end of file diff --git a/doc/devel/release.html b/doc/devel/release.html index 73f7a0e304..226148e93b 100644 --- a/doc/devel/release.html +++ b/doc/devel/release.html @@ -66,6 +66,13 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.11.4+labe 1.11.4 milestone</a> on our issue tracker for details. </p> +<p> +go1.11.5 (released 2019/01/23) includes a security fix to the +<code>crypto/elliptic</code> package. +See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.11.5+label%3ACherryPickApproved">Go +1.11.5 milestone</a> on our issue tracker for details. +</p> + <h2 id="go1.10">go1.10 (released 2018/02/16)</h2> <p> @@ -131,6 +138,13 @@ See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.10.7+labe Go 1.10.7 milestone</a> on our issue tracker for details. </p> +<p> +go1.10.8 (released 2019/01/23) includes a security fix to the +<code>crypto/elliptic</code> package. +See the <a href="https://github.com/golang/go/issues?q=milestone%3AGo1.10.8+label%3ACherryPickApproved">Go +1.10.8 milestone</a> on our issue tracker for details. +</p> + <h2 id="go1.9">go1.9 (released 2017/08/24)</h2> <p> diff --git a/src/crypto/elliptic/elliptic.go b/src/crypto/elliptic/elliptic.go index 4fc2b5e521..c84657c5e3 100644 --- a/src/crypto/elliptic/elliptic.go +++ b/src/crypto/elliptic/elliptic.go @@ -210,8 +210,9 @@ func (curve *CurveParams) doubleJacobian(x, y, z *big.Int) (*big.Int, *big.Int, x3 := new(big.Int).Mul(alpha, alpha) beta8 := new(big.Int).Lsh(beta, 3) + beta8.Mod(beta8, curve.P) x3.Sub(x3, beta8) - for x3.Sign() == -1 { + if x3.Sign() == -1 { x3.Add(x3, curve.P) } x3.Mod(x3, curve.P) |