diff options
author | Julie Qiu <julie@golang.org> | 2019-01-23 16:25:08 -0500 |
---|---|---|
committer | Julie Qiu <julie@golang.org> | 2019-01-23 16:25:08 -0500 |
commit | bd0449f8d16a5ac1b1962c7ea07d764a7f18eca7 (patch) | |
tree | 3c78ad9ffd231bd6b407418fdb00e0813127bc7e | |
parent | c731a7daf4e0db719c944f3c2073bed86c9fbf51 (diff) | |
parent | b0cb374daf646454998bac7b393f3236a2ab6aca (diff) | |
download | go-bd0449f8d16a5ac1b1962c7ea07d764a7f18eca7.tar.gz go-bd0449f8d16a5ac1b1962c7ea07d764a7f18eca7.zip |
[release-branch.go1.10] all: merge release-branch.go1.10-security into release-branch.go1.10
Change-Id: Iddb571880e8b688b8de9cd013f497f6eed0c7692
-rw-r--r-- | VERSION | 2 | ||||
-rw-r--r-- | doc/devel/release.html | 7 | ||||
-rw-r--r-- | src/crypto/elliptic/elliptic.go | 3 |
3 files changed, 10 insertions, 2 deletions
@@ -1 +1 @@ -go1.10.7
\ No newline at end of file +go1.10.8
\ No newline at end of file diff --git a/doc/devel/release.html b/doc/devel/release.html index 9f4500ac79..89991f48c1 100644 --- a/doc/devel/release.html +++ b/doc/devel/release.html @@ -87,6 +87,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 35aacf24e5..76b78a790e 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) |