1 --- libgo/Makefile.am.jj 2014-01-08 13:53:06.000000000 +0100
2 +++ libgo/Makefile.am 2014-03-05 15:20:09.938466093 +0100
3 @@ -1133,7 +1133,6 @@ go_crypto_ecdsa_files = \
4 go/crypto/ecdsa/ecdsa.go
5 go_crypto_elliptic_files = \
6 go/crypto/elliptic/elliptic.go \
7 - go/crypto/elliptic/p224.go \
8 go/crypto/elliptic/p256.go
9 go_crypto_hmac_files = \
10 go/crypto/hmac/hmac.go
11 --- libgo/Makefile.in.jj 2014-01-08 13:53:06.000000000 +0100
12 +++ libgo/Makefile.in 2014-03-05 15:20:20.372465471 +0100
13 @@ -1291,7 +1291,6 @@ go_crypto_ecdsa_files = \
15 go_crypto_elliptic_files = \
16 go/crypto/elliptic/elliptic.go \
17 - go/crypto/elliptic/p224.go \
18 go/crypto/elliptic/p256.go
20 go_crypto_hmac_files = \
21 --- libgo/go/crypto/elliptic/elliptic.go.jj 2013-11-07 11:59:09.000000000 +0100
22 +++ libgo/go/crypto/elliptic/elliptic.go 2014-03-05 15:21:04.186462859 +0100
23 @@ -326,7 +326,6 @@ var p384 *CurveParams
31 --- libgo/go/crypto/elliptic/elliptic_test.go.jj 2013-11-07 11:59:09.000000000 +0100
32 +++ libgo/go/crypto/elliptic/elliptic_test.go 2014-03-05 15:46:03.739373453 +0100
44 -func TestOnCurve(t *testing.T) {
46 - if !p224.IsOnCurve(p224.Params().Gx, p224.Params().Gy) {
51 type baseMultTest struct {
56 -var p224BaseMultTests = []baseMultTest{
57 +var p256BaseMultTests = []baseMultTest{
60 "b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21",
61 @@ -287,47 +277,12 @@ var p224BaseMultTests = []baseMultTest{
65 -func TestBaseMult(t *testing.T) {
67 - for i, e := range p224BaseMultTests {
68 - k, ok := new(big.Int).SetString(e.k, 10)
70 - t.Errorf("%d: bad value for k: %s", i, e.k)
72 - x, y := p224.ScalarBaseMult(k.Bytes())
73 - if fmt.Sprintf("%x", x) != e.x || fmt.Sprintf("%x", y) != e.y {
74 - t.Errorf("%d: bad output for k=%s: got (%x, %x), want (%s, %s)", i, e.k, x, y, e.x, e.y)
76 - if testing.Short() && i > 5 {
82 -func TestGenericBaseMult(t *testing.T) {
83 - // We use the P224 CurveParams directly in order to test the generic implementation.
84 - p224 := P224().Params()
85 - for i, e := range p224BaseMultTests {
86 - k, ok := new(big.Int).SetString(e.k, 10)
88 - t.Errorf("%d: bad value for k: %s", i, e.k)
90 - x, y := p224.ScalarBaseMult(k.Bytes())
91 - if fmt.Sprintf("%x", x) != e.x || fmt.Sprintf("%x", y) != e.y {
92 - t.Errorf("%d: bad output for k=%s: got (%x, %x), want (%s, %s)", i, e.k, x, y, e.x, e.y)
94 - if testing.Short() && i > 5 {
100 func TestP256BaseMult(t *testing.T) {
102 p256Generic := p256.Params()
104 - scalars := make([]*big.Int, 0, len(p224BaseMultTests)+1)
105 - for _, e := range p224BaseMultTests {
106 + scalars := make([]*big.Int, 0, len(p256BaseMultTests)+1)
107 + for _, e := range p256BaseMultTests {
108 k, _ := new(big.Int).SetString(e.k, 10)
109 scalars = append(scalars, k)
111 @@ -352,7 +307,7 @@ func TestP256Mult(t *testing.T) {
113 p256Generic := p256.Params()
115 - for i, e := range p224BaseMultTests {
116 + for i, e := range p256BaseMultTests {
117 x, _ := new(big.Int).SetString(e.x, 16)
118 y, _ := new(big.Int).SetString(e.y, 16)
119 k, _ := new(big.Int).SetString(e.k, 10)
120 @@ -373,7 +328,6 @@ func TestInfinity(t *testing.T) {
128 @@ -406,53 +360,13 @@ func TestInfinity(t *testing.T) {
132 -func BenchmarkBaseMult(b *testing.B) {
135 - e := p224BaseMultTests[25]
136 - k, _ := new(big.Int).SetString(e.k, 10)
138 - for i := 0; i < b.N; i++ {
139 - p224.ScalarBaseMult(k.Bytes())
143 func BenchmarkBaseMultP256(b *testing.B) {
146 - e := p224BaseMultTests[25]
147 + e := p256BaseMultTests[25]
148 k, _ := new(big.Int).SetString(e.k, 10)
150 for i := 0; i < b.N; i++ {
151 p256.ScalarBaseMult(k.Bytes())
155 -func TestMarshal(t *testing.T) {
157 - _, x, y, err := GenerateKey(p224, rand.Reader)
162 - serialized := Marshal(p224, x, y)
163 - xx, yy := Unmarshal(p224, serialized)
165 - t.Error("failed to unmarshal")
168 - if xx.Cmp(x) != 0 || yy.Cmp(y) != 0 {
169 - t.Error("unmarshal returned different values")
174 -func TestP224Overflow(t *testing.T) {
175 - // This tests for a specific bug in the P224 implementation.
177 - pointData, _ := hex.DecodeString("049B535B45FB0A2072398A6831834624C7E32CCFD5A4B933BCEAF77F1DD945E08BBE5178F5EDF5E733388F196D2A631D2E075BB16CBFEEA15B")
178 - x, y := Unmarshal(p224, pointData)
179 - if !p224.IsOnCurve(x, y) {
180 - t.Error("P224 failed to validate a correct point")
183 --- libgo/go/crypto/ecdsa/ecdsa_test.go.jj 2012-11-15 18:26:56.000000000 +0100
184 +++ libgo/go/crypto/ecdsa/ecdsa_test.go 2014-03-05 15:26:38.461442929 +0100
185 @@ -33,7 +33,6 @@ func testKeyGeneration(t *testing.T, c e
188 func TestKeyGeneration(t *testing.T) {
189 - testKeyGeneration(t, elliptic.P224(), "p224")
193 @@ -63,7 +62,6 @@ func testSignAndVerify(t *testing.T, c e
196 func TestSignAndVerify(t *testing.T) {
197 - testSignAndVerify(t, elliptic.P224(), "p224")
201 @@ -129,8 +127,6 @@ func TestVectors(t *testing.T) {
202 parts := strings.SplitN(line, ",", 2)
206 - pub.Curve = elliptic.P224()
208 pub.Curve = elliptic.P256()
210 --- libgo/go/crypto/x509/x509.go.jj 2013-11-07 11:59:09.000000000 +0100
211 +++ libgo/go/crypto/x509/x509.go 2014-03-05 15:27:37.022439437 +0100
212 @@ -305,9 +305,6 @@ func getPublicKeyAlgorithmFromOID(oid as
214 // RFC 5480, 2.1.1.1. Named Curve
216 -// secp224r1 OBJECT IDENTIFIER ::= {
217 -// iso(1) identified-organization(3) certicom(132) curve(0) 33 }
219 // secp256r1 OBJECT IDENTIFIER ::= {
220 // iso(1) member-body(2) us(840) ansi-X9-62(10045) curves(3)
222 @@ -320,7 +317,6 @@ func getPublicKeyAlgorithmFromOID(oid as
224 // NB: secp256r1 is equivalent to prime256v1
226 - oidNamedCurveP224 = asn1.ObjectIdentifier{1, 3, 132, 0, 33}
227 oidNamedCurveP256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 3, 1, 7}
228 oidNamedCurveP384 = asn1.ObjectIdentifier{1, 3, 132, 0, 34}
229 oidNamedCurveP521 = asn1.ObjectIdentifier{1, 3, 132, 0, 35}
230 @@ -328,8 +324,6 @@ var (
232 func namedCurveFromOID(oid asn1.ObjectIdentifier) elliptic.Curve {
234 - case oid.Equal(oidNamedCurveP224):
235 - return elliptic.P224()
236 case oid.Equal(oidNamedCurveP256):
237 return elliptic.P256()
238 case oid.Equal(oidNamedCurveP384):
239 @@ -342,8 +336,6 @@ func namedCurveFromOID(oid asn1.ObjectId
241 func oidFromNamedCurve(curve elliptic.Curve) (asn1.ObjectIdentifier, bool) {
243 - case elliptic.P224():
244 - return oidNamedCurveP224, true
245 case elliptic.P256():
246 return oidNamedCurveP256, true
247 case elliptic.P384():
248 @@ -1373,7 +1365,7 @@ func CreateCertificate(rand io.Reader, t
249 hashFunc = crypto.SHA1
250 case *ecdsa.PrivateKey:
252 - case elliptic.P224(), elliptic.P256():
253 + case elliptic.P256():
254 hashFunc = crypto.SHA256
255 signatureAlgorithm.Algorithm = oidSignatureECDSAWithSHA256
256 case elliptic.P384():
257 --- libgo/go/crypto/elliptic/p224.go.jj 2012-11-15 18:26:57.000000000 +0100
258 +++ libgo/go/crypto/elliptic/p224.go 2014-03-05 15:30:01.189430842 +0100
260 -// Copyright 2012 The Go Authors. All rights reserved.
261 -// Use of this source code is governed by a BSD-style
262 -// license that can be found in the LICENSE file.
266 -// This is a constant-time, 32-bit implementation of P224. See FIPS 186-3,
269 -// See http://www.imperialviolet.org/2010/12/04/ecc.html ([1]) for background.
277 -type p224Curve struct {
279 - gx, gy, b p224FieldElement
283 - // See FIPS 186-3, section D.2.2
284 - p224.CurveParams = new(CurveParams)
285 - p224.P, _ = new(big.Int).SetString("26959946667150639794667015087019630673557916260026308143510066298881", 10)
286 - p224.N, _ = new(big.Int).SetString("26959946667150639794667015087019625940457807714424391721682722368061", 10)
287 - p224.B, _ = new(big.Int).SetString("b4050a850c04b3abf54132565044b0b7d7bfd8ba270b39432355ffb4", 16)
288 - p224.Gx, _ = new(big.Int).SetString("b70e0cbd6bb4bf7f321390b94a03c1d356c21122343280d6115c1d21", 16)
289 - p224.Gy, _ = new(big.Int).SetString("bd376388b5f723fb4c22dfe6cd4375a05a07476444d5819985007e34", 16)
292 - p224FromBig(&p224.gx, p224.Gx)
293 - p224FromBig(&p224.gy, p224.Gy)
294 - p224FromBig(&p224.b, p224.B)
297 -// P224 returns a Curve which implements P-224 (see FIPS 186-3, section D.2.2)
299 - initonce.Do(initAll)
303 -func (curve p224Curve) Params() *CurveParams {
304 - return curve.CurveParams
307 -func (curve p224Curve) IsOnCurve(bigX, bigY *big.Int) bool {
308 - var x, y p224FieldElement
309 - p224FromBig(&x, bigX)
310 - p224FromBig(&y, bigY)
312 - // y² = x³ - 3x + b
313 - var tmp p224LargeFieldElement
314 - var x3 p224FieldElement
315 - p224Square(&x3, &x, &tmp)
316 - p224Mul(&x3, &x3, &x, &tmp)
318 - for i := 0; i < 8; i++ {
321 - p224Sub(&x3, &x3, &x)
323 - p224Add(&x3, &x3, &curve.b)
324 - p224Contract(&x3, &x3)
326 - p224Square(&y, &y, &tmp)
327 - p224Contract(&y, &y)
329 - for i := 0; i < 8; i++ {
337 -func (p224Curve) Add(bigX1, bigY1, bigX2, bigY2 *big.Int) (x, y *big.Int) {
338 - var x1, y1, z1, x2, y2, z2, x3, y3, z3 p224FieldElement
340 - p224FromBig(&x1, bigX1)
341 - p224FromBig(&y1, bigY1)
342 - if bigX1.Sign() != 0 || bigY1.Sign() != 0 {
345 - p224FromBig(&x2, bigX2)
346 - p224FromBig(&y2, bigY2)
347 - if bigX2.Sign() != 0 || bigY2.Sign() != 0 {
351 - p224AddJacobian(&x3, &y3, &z3, &x1, &y1, &z1, &x2, &y2, &z2)
352 - return p224ToAffine(&x3, &y3, &z3)
355 -func (p224Curve) Double(bigX1, bigY1 *big.Int) (x, y *big.Int) {
356 - var x1, y1, z1, x2, y2, z2 p224FieldElement
358 - p224FromBig(&x1, bigX1)
359 - p224FromBig(&y1, bigY1)
362 - p224DoubleJacobian(&x2, &y2, &z2, &x1, &y1, &z1)
363 - return p224ToAffine(&x2, &y2, &z2)
366 -func (p224Curve) ScalarMult(bigX1, bigY1 *big.Int, scalar []byte) (x, y *big.Int) {
367 - var x1, y1, z1, x2, y2, z2 p224FieldElement
369 - p224FromBig(&x1, bigX1)
370 - p224FromBig(&y1, bigY1)
373 - p224ScalarMult(&x2, &y2, &z2, &x1, &y1, &z1, scalar)
374 - return p224ToAffine(&x2, &y2, &z2)
377 -func (curve p224Curve) ScalarBaseMult(scalar []byte) (x, y *big.Int) {
378 - var z1, x2, y2, z2 p224FieldElement
381 - p224ScalarMult(&x2, &y2, &z2, &curve.gx, &curve.gy, &z1, scalar)
382 - return p224ToAffine(&x2, &y2, &z2)
385 -// Field element functions.
387 -// The field that we're dealing with is ℤ/pℤ where p = 2**224 - 2**96 + 1.
389 -// Field elements are represented by a FieldElement, which is a typedef to an
390 -// array of 8 uint32's. The value of a FieldElement, a, is:
391 -// a[0] + 2**28·a[1] + 2**56·a[1] + ... + 2**196·a[7]
393 -// Using 28-bit limbs means that there's only 4 bits of headroom, which is less
394 -// than we would really like. But it has the useful feature that we hit 2**224
395 -// exactly, making the reflections during a reduce much nicer.
396 -type p224FieldElement [8]uint32
398 -// p224P is the order of the field, represented as a p224FieldElement.
399 -var p224P = [8]uint32{1, 0, 0, 0xffff000, 0xfffffff, 0xfffffff, 0xfffffff, 0xfffffff}
401 -// p224IsZero returns 1 if a == 0 mod p and 0 otherwise.
404 -func p224IsZero(a *p224FieldElement) uint32 {
405 - // Since a p224FieldElement contains 224 bits there are two possible
406 - // representations of 0: 0 and p.
407 - var minimal p224FieldElement
408 - p224Contract(&minimal, a)
410 - var isZero, isP uint32
411 - for i, v := range minimal {
413 - isP |= v - p224P[i]
416 - // If either isZero or isP is 0, then we should return 1.
417 - isZero |= isZero >> 16
418 - isZero |= isZero >> 8
419 - isZero |= isZero >> 4
420 - isZero |= isZero >> 2
421 - isZero |= isZero >> 1
429 - // For isZero and isP, the LSB is 0 iff all the bits are zero.
430 - result := isZero & isP
431 - result = (^result) & 1
436 -// p224Add computes *out = a+b
438 -// a[i] + b[i] < 2**32
439 -func p224Add(out, a, b *p224FieldElement) {
440 - for i := 0; i < 8; i++ {
441 - out[i] = a[i] + b[i]
445 -const two31p3 = 1<<31 + 1<<3
446 -const two31m3 = 1<<31 - 1<<3
447 -const two31m15m3 = 1<<31 - 1<<15 - 1<<3
449 -// p224ZeroModP31 is 0 mod p where bit 31 is set in all limbs so that we can
450 -// subtract smaller amounts without underflow. See the section "Subtraction" in
451 -// [1] for reasoning.
452 -var p224ZeroModP31 = []uint32{two31p3, two31m3, two31m3, two31m15m3, two31m3, two31m3, two31m3, two31m3}
454 -// p224Sub computes *out = a-b
456 -// a[i], b[i] < 2**30
458 -func p224Sub(out, a, b *p224FieldElement) {
459 - for i := 0; i < 8; i++ {
460 - out[i] = a[i] + p224ZeroModP31[i] - b[i]
464 -// LargeFieldElement also represents an element of the field. The limbs are
465 -// still spaced 28-bits apart and in little-endian order. So the limbs are at
466 -// 0, 28, 56, ..., 392 bits, each 64-bits wide.
467 -type p224LargeFieldElement [15]uint64
469 -const two63p35 = 1<<63 + 1<<35
470 -const two63m35 = 1<<63 - 1<<35
471 -const two63m35m19 = 1<<63 - 1<<35 - 1<<19
473 -// p224ZeroModP63 is 0 mod p where bit 63 is set in all limbs. See the section
474 -// "Subtraction" in [1] for why.
475 -var p224ZeroModP63 = [8]uint64{two63p35, two63m35, two63m35, two63m35, two63m35m19, two63m35, two63m35, two63m35}
477 -const bottom12Bits = 0xfff
478 -const bottom28Bits = 0xfffffff
480 -// p224Mul computes *out = a*b
482 -// a[i] < 2**29, b[i] < 2**30 (or vice versa)
484 -func p224Mul(out, a, b *p224FieldElement, tmp *p224LargeFieldElement) {
485 - for i := 0; i < 15; i++ {
489 - for i := 0; i < 8; i++ {
490 - for j := 0; j < 8; j++ {
491 - tmp[i+j] += uint64(a[i]) * uint64(b[j])
495 - p224ReduceLarge(out, tmp)
498 -// Square computes *out = a*a
502 -func p224Square(out, a *p224FieldElement, tmp *p224LargeFieldElement) {
503 - for i := 0; i < 15; i++ {
507 - for i := 0; i < 8; i++ {
508 - for j := 0; j <= i; j++ {
509 - r := uint64(a[i]) * uint64(a[j])
518 - p224ReduceLarge(out, tmp)
521 -// ReduceLarge converts a p224LargeFieldElement to a p224FieldElement.
524 -func p224ReduceLarge(out *p224FieldElement, in *p224LargeFieldElement) {
525 - for i := 0; i < 8; i++ {
526 - in[i] += p224ZeroModP63[i]
529 - // Eliminate the coefficients at 2**224 and greater.
530 - for i := 14; i >= 8; i-- {
532 - in[i-5] += (in[i] & 0xffff) << 12
533 - in[i-4] += in[i] >> 16
536 - // in[0..8] < 2**64
538 - // As the values become small enough, we start to store them in |out|
539 - // and use 32-bit operations.
540 - for i := 1; i < 8; i++ {
541 - in[i+1] += in[i] >> 28
542 - out[i] = uint32(in[i] & bottom28Bits)
545 - out[3] += uint32(in[8]&0xffff) << 12
546 - out[4] += uint32(in[8] >> 16)
550 - // out[1,2,5..7] < 2**28
552 - out[0] = uint32(in[0] & bottom28Bits)
553 - out[1] += uint32((in[0] >> 28) & bottom28Bits)
554 - out[2] += uint32(in[0] >> 56)
556 - // out[1..4] < 2**29
557 - // out[5..7] < 2**28
560 -// Reduce reduces the coefficients of a to smaller bounds.
562 -// On entry: a[i] < 2**31 + 2**30
563 -// On exit: a[i] < 2**29
564 -func p224Reduce(a *p224FieldElement) {
565 - for i := 0; i < 7; i++ {
566 - a[i+1] += a[i] >> 28
567 - a[i] &= bottom28Bits
570 - a[7] &= bottom28Bits
577 - mask = uint32(int32(mask) >> 31)
578 - // Mask is all ones if top != 0, all zero otherwise
583 - // We may have just made a[0] negative but, if we did, then we must
584 - // have added something to a[3], this it's > 2**12. Therefore we can
585 - // carry down to a[0].
587 - a[2] += mask & (1<<28 - 1)
588 - a[1] += mask & (1<<28 - 1)
589 - a[0] += mask & (1 << 28)
592 -// p224Invert calculates *out = in**-1 by computing in**(2**224 - 2**96 - 1),
593 -// i.e. Fermat's little theorem.
594 -func p224Invert(out, in *p224FieldElement) {
595 - var f1, f2, f3, f4 p224FieldElement
596 - var c p224LargeFieldElement
598 - p224Square(&f1, in, &c) // 2
599 - p224Mul(&f1, &f1, in, &c) // 2**2 - 1
600 - p224Square(&f1, &f1, &c) // 2**3 - 2
601 - p224Mul(&f1, &f1, in, &c) // 2**3 - 1
602 - p224Square(&f2, &f1, &c) // 2**4 - 2
603 - p224Square(&f2, &f2, &c) // 2**5 - 4
604 - p224Square(&f2, &f2, &c) // 2**6 - 8
605 - p224Mul(&f1, &f1, &f2, &c) // 2**6 - 1
606 - p224Square(&f2, &f1, &c) // 2**7 - 2
607 - for i := 0; i < 5; i++ { // 2**12 - 2**6
608 - p224Square(&f2, &f2, &c)
610 - p224Mul(&f2, &f2, &f1, &c) // 2**12 - 1
611 - p224Square(&f3, &f2, &c) // 2**13 - 2
612 - for i := 0; i < 11; i++ { // 2**24 - 2**12
613 - p224Square(&f3, &f3, &c)
615 - p224Mul(&f2, &f3, &f2, &c) // 2**24 - 1
616 - p224Square(&f3, &f2, &c) // 2**25 - 2
617 - for i := 0; i < 23; i++ { // 2**48 - 2**24
618 - p224Square(&f3, &f3, &c)
620 - p224Mul(&f3, &f3, &f2, &c) // 2**48 - 1
621 - p224Square(&f4, &f3, &c) // 2**49 - 2
622 - for i := 0; i < 47; i++ { // 2**96 - 2**48
623 - p224Square(&f4, &f4, &c)
625 - p224Mul(&f3, &f3, &f4, &c) // 2**96 - 1
626 - p224Square(&f4, &f3, &c) // 2**97 - 2
627 - for i := 0; i < 23; i++ { // 2**120 - 2**24
628 - p224Square(&f4, &f4, &c)
630 - p224Mul(&f2, &f4, &f2, &c) // 2**120 - 1
631 - for i := 0; i < 6; i++ { // 2**126 - 2**6
632 - p224Square(&f2, &f2, &c)
634 - p224Mul(&f1, &f1, &f2, &c) // 2**126 - 1
635 - p224Square(&f1, &f1, &c) // 2**127 - 2
636 - p224Mul(&f1, &f1, in, &c) // 2**127 - 1
637 - for i := 0; i < 97; i++ { // 2**224 - 2**97
638 - p224Square(&f1, &f1, &c)
640 - p224Mul(out, &f1, &f3, &c) // 2**224 - 2**96 - 1
643 -// p224Contract converts a FieldElement to its unique, minimal form.
645 -// On entry, in[i] < 2**29
646 -// On exit, in[i] < 2**28
647 -func p224Contract(out, in *p224FieldElement) {
648 - copy(out[:], in[:])
650 - for i := 0; i < 7; i++ {
651 - out[i+1] += out[i] >> 28
652 - out[i] &= bottom28Bits
654 - top := out[7] >> 28
655 - out[7] &= bottom28Bits
658 - out[3] += top << 12
660 - // We may just have made out[i] negative. So we carry down. If we made
661 - // out[0] negative then we know that out[3] is sufficiently positive
662 - // because we just added to it.
663 - for i := 0; i < 3; i++ {
664 - mask := uint32(int32(out[i]) >> 31)
665 - out[i] += (1 << 28) & mask
666 - out[i+1] -= 1 & mask
669 - // We might have pushed out[3] over 2**28 so we perform another, partial,
671 - for i := 3; i < 7; i++ {
672 - out[i+1] += out[i] >> 28
673 - out[i] &= bottom28Bits
676 - out[7] &= bottom28Bits
678 - // Eliminate top while maintaining the same value mod p.
680 - out[3] += top << 12
682 - // There are two cases to consider for out[3]:
683 - // 1) The first time that we eliminated top, we didn't push out[3] over
684 - // 2**28. In this case, the partial carry chain didn't change any values
685 - // and top is zero.
686 - // 2) We did push out[3] over 2**28 the first time that we eliminated top.
687 - // The first value of top was in [0..16), therefore, prior to eliminating
688 - // the first top, 0xfff1000 <= out[3] <= 0xfffffff. Therefore, after
689 - // overflowing and being reduced by the second carry chain, out[3] <=
690 - // 0xf000. Thus it cannot have overflowed when we eliminated top for the
693 - // Again, we may just have made out[0] negative, so do the same carry down.
694 - // As before, if we made out[0] negative then we know that out[3] is
695 - // sufficiently positive.
696 - for i := 0; i < 3; i++ {
697 - mask := uint32(int32(out[i]) >> 31)
698 - out[i] += (1 << 28) & mask
699 - out[i+1] -= 1 & mask
702 - // Now we see if the value is >= p and, if so, subtract p.
704 - // First we build a mask from the top four limbs, which must all be
705 - // equal to bottom28Bits if the whole value is >= p. If top4AllOnes
706 - // ends up with any zero bits in the bottom 28 bits, then this wasn't
708 - top4AllOnes := uint32(0xffffffff)
709 - for i := 4; i < 8; i++ {
710 - top4AllOnes &= out[i]
712 - top4AllOnes |= 0xf0000000
713 - // Now we replicate any zero bits to all the bits in top4AllOnes.
714 - top4AllOnes &= top4AllOnes >> 16
715 - top4AllOnes &= top4AllOnes >> 8
716 - top4AllOnes &= top4AllOnes >> 4
717 - top4AllOnes &= top4AllOnes >> 2
718 - top4AllOnes &= top4AllOnes >> 1
719 - top4AllOnes = uint32(int32(top4AllOnes<<31) >> 31)
721 - // Now we test whether the bottom three limbs are non-zero.
722 - bottom3NonZero := out[0] | out[1] | out[2]
723 - bottom3NonZero |= bottom3NonZero >> 16
724 - bottom3NonZero |= bottom3NonZero >> 8
725 - bottom3NonZero |= bottom3NonZero >> 4
726 - bottom3NonZero |= bottom3NonZero >> 2
727 - bottom3NonZero |= bottom3NonZero >> 1
728 - bottom3NonZero = uint32(int32(bottom3NonZero<<31) >> 31)
730 - // Everything depends on the value of out[3].
731 - // If it's > 0xffff000 and top4AllOnes != 0 then the whole value is >= p
732 - // If it's = 0xffff000 and top4AllOnes != 0 and bottom3NonZero != 0,
733 - // then the whole value is >= p
734 - // If it's < 0xffff000, then the whole value is < p
735 - n := out[3] - 0xffff000
737 - out3Equal |= out3Equal >> 16
738 - out3Equal |= out3Equal >> 8
739 - out3Equal |= out3Equal >> 4
740 - out3Equal |= out3Equal >> 2
741 - out3Equal |= out3Equal >> 1
742 - out3Equal = ^uint32(int32(out3Equal<<31) >> 31)
744 - // If out[3] > 0xffff000 then n's MSB will be zero.
745 - out3GT := ^uint32(int32(n) >> 31)
747 - mask := top4AllOnes & ((out3Equal & bottom3NonZero) | out3GT)
749 - out[3] -= 0xffff000 & mask
750 - out[4] -= 0xfffffff & mask
751 - out[5] -= 0xfffffff & mask
752 - out[6] -= 0xfffffff & mask
753 - out[7] -= 0xfffffff & mask
756 -// Group element functions.
758 -// These functions deal with group elements. The group is an elliptic curve
759 -// group with a = -3 defined in FIPS 186-3, section D.2.2.
761 -// p224AddJacobian computes *out = a+b where a != b.
762 -func p224AddJacobian(x3, y3, z3, x1, y1, z1, x2, y2, z2 *p224FieldElement) {
763 - // See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-3.html#addition-p224Add-2007-bl
764 - var z1z1, z2z2, u1, u2, s1, s2, h, i, j, r, v p224FieldElement
765 - var c p224LargeFieldElement
767 - z1IsZero := p224IsZero(z1)
768 - z2IsZero := p224IsZero(z2)
771 - p224Square(&z1z1, z1, &c)
773 - p224Square(&z2z2, z2, &c)
775 - p224Mul(&u1, x1, &z2z2, &c)
777 - p224Mul(&u2, x2, &z1z1, &c)
779 - p224Mul(&s1, z2, &z2z2, &c)
780 - p224Mul(&s1, y1, &s1, &c)
782 - p224Mul(&s2, z1, &z1z1, &c)
783 - p224Mul(&s2, y2, &s2, &c)
785 - p224Sub(&h, &u2, &u1)
787 - xEqual := p224IsZero(&h)
789 - for j := 0; j < 8; j++ {
793 - p224Square(&i, &i, &c)
795 - p224Mul(&j, &h, &i, &c)
797 - p224Sub(&r, &s2, &s1)
799 - yEqual := p224IsZero(&r)
800 - if xEqual == 1 && yEqual == 1 && z1IsZero == 0 && z2IsZero == 0 {
801 - p224DoubleJacobian(x3, y3, z3, x1, y1, z1)
804 - for i := 0; i < 8; i++ {
809 - p224Mul(&v, &u1, &i, &c)
810 - // Z3 = ((Z1+Z2)²-Z1Z1-Z2Z2)*H
811 - p224Add(&z1z1, &z1z1, &z2z2)
812 - p224Add(&z2z2, z1, z2)
814 - p224Square(&z2z2, &z2z2, &c)
815 - p224Sub(z3, &z2z2, &z1z1)
817 - p224Mul(z3, z3, &h, &c)
819 - for i := 0; i < 8; i++ {
820 - z1z1[i] = v[i] << 1
822 - p224Add(&z1z1, &j, &z1z1)
824 - p224Square(x3, &r, &c)
825 - p224Sub(x3, x3, &z1z1)
827 - // Y3 = r*(V-X3)-2*S1*J
828 - for i := 0; i < 8; i++ {
831 - p224Mul(&s1, &s1, &j, &c)
832 - p224Sub(&z1z1, &v, x3)
834 - p224Mul(&z1z1, &z1z1, &r, &c)
835 - p224Sub(y3, &z1z1, &s1)
838 - p224CopyConditional(x3, x2, z1IsZero)
839 - p224CopyConditional(x3, x1, z2IsZero)
840 - p224CopyConditional(y3, y2, z1IsZero)
841 - p224CopyConditional(y3, y1, z2IsZero)
842 - p224CopyConditional(z3, z2, z1IsZero)
843 - p224CopyConditional(z3, z1, z2IsZero)
846 -// p224DoubleJacobian computes *out = a+a.
847 -func p224DoubleJacobian(x3, y3, z3, x1, y1, z1 *p224FieldElement) {
848 - var delta, gamma, beta, alpha, t p224FieldElement
849 - var c p224LargeFieldElement
851 - p224Square(&delta, z1, &c)
852 - p224Square(&gamma, y1, &c)
853 - p224Mul(&beta, x1, &gamma, &c)
855 - // alpha = 3*(X1-delta)*(X1+delta)
856 - p224Add(&t, x1, &delta)
857 - for i := 0; i < 8; i++ {
861 - p224Sub(&alpha, x1, &delta)
863 - p224Mul(&alpha, &alpha, &t, &c)
865 - // Z3 = (Y1+Z1)²-gamma-delta
866 - p224Add(z3, y1, z1)
868 - p224Square(z3, z3, &c)
869 - p224Sub(z3, z3, &gamma)
871 - p224Sub(z3, z3, &delta)
874 - // X3 = alpha²-8*beta
875 - for i := 0; i < 8; i++ {
876 - delta[i] = beta[i] << 3
879 - p224Square(x3, &alpha, &c)
880 - p224Sub(x3, x3, &delta)
883 - // Y3 = alpha*(4*beta-X3)-8*gamma²
884 - for i := 0; i < 8; i++ {
887 - p224Sub(&beta, &beta, x3)
889 - p224Square(&gamma, &gamma, &c)
890 - for i := 0; i < 8; i++ {
894 - p224Mul(y3, &alpha, &beta, &c)
895 - p224Sub(y3, y3, &gamma)
899 -// p224CopyConditional sets *out = *in iff the least-significant-bit of control
900 -// is true, and it runs in constant time.
901 -func p224CopyConditional(out, in *p224FieldElement, control uint32) {
903 - control = uint32(int32(control) >> 31)
905 - for i := 0; i < 8; i++ {
906 - out[i] ^= (out[i] ^ in[i]) & control
910 -func p224ScalarMult(outX, outY, outZ, inX, inY, inZ *p224FieldElement, scalar []byte) {
911 - var xx, yy, zz p224FieldElement
912 - for i := 0; i < 8; i++ {
918 - for _, byte := range scalar {
919 - for bitNum := uint(0); bitNum < 8; bitNum++ {
920 - p224DoubleJacobian(outX, outY, outZ, outX, outY, outZ)
921 - bit := uint32((byte >> (7 - bitNum)) & 1)
922 - p224AddJacobian(&xx, &yy, &zz, inX, inY, inZ, outX, outY, outZ)
923 - p224CopyConditional(outX, &xx, bit)
924 - p224CopyConditional(outY, &yy, bit)
925 - p224CopyConditional(outZ, &zz, bit)
930 -// p224ToAffine converts from Jacobian to affine form.
931 -func p224ToAffine(x, y, z *p224FieldElement) (*big.Int, *big.Int) {
932 - var zinv, zinvsq, outx, outy p224FieldElement
933 - var tmp p224LargeFieldElement
935 - if isPointAtInfinity := p224IsZero(z); isPointAtInfinity == 1 {
936 - return new(big.Int), new(big.Int)
939 - p224Invert(&zinv, z)
940 - p224Square(&zinvsq, &zinv, &tmp)
941 - p224Mul(x, x, &zinvsq, &tmp)
942 - p224Mul(&zinvsq, &zinvsq, &zinv, &tmp)
943 - p224Mul(y, y, &zinvsq, &tmp)
945 - p224Contract(&outx, x)
946 - p224Contract(&outy, y)
947 - return p224ToBig(&outx), p224ToBig(&outy)
950 -// get28BitsFromEnd returns the least-significant 28 bits from buf>>shift,
951 -// where buf is interpreted as a big-endian number.
952 -func get28BitsFromEnd(buf []byte, shift uint) (uint32, []byte) {
955 - for i := uint(0); i < 4; i++ {
957 - if l := len(buf); l > 0 {
959 - // We don't remove the byte if we're about to return and we're not
960 - // reading all of it.
961 - if i != 3 || shift == 4 {
965 - ret |= uint32(b) << (8 * i) >> shift
967 - ret &= bottom28Bits
971 -// p224FromBig sets *out = *in.
972 -func p224FromBig(out *p224FieldElement, in *big.Int) {
973 - bytes := in.Bytes()
974 - out[0], bytes = get28BitsFromEnd(bytes, 0)
975 - out[1], bytes = get28BitsFromEnd(bytes, 4)
976 - out[2], bytes = get28BitsFromEnd(bytes, 0)
977 - out[3], bytes = get28BitsFromEnd(bytes, 4)
978 - out[4], bytes = get28BitsFromEnd(bytes, 0)
979 - out[5], bytes = get28BitsFromEnd(bytes, 4)
980 - out[6], bytes = get28BitsFromEnd(bytes, 0)
981 - out[7], bytes = get28BitsFromEnd(bytes, 4)
984 -// p224ToBig returns in as a big.Int.
985 -func p224ToBig(in *p224FieldElement) *big.Int {
987 - buf[27] = byte(in[0])
988 - buf[26] = byte(in[0] >> 8)
989 - buf[25] = byte(in[0] >> 16)
990 - buf[24] = byte(((in[0] >> 24) & 0x0f) | (in[1]<<4)&0xf0)
992 - buf[23] = byte(in[1] >> 4)
993 - buf[22] = byte(in[1] >> 12)
994 - buf[21] = byte(in[1] >> 20)
996 - buf[20] = byte(in[2])
997 - buf[19] = byte(in[2] >> 8)
998 - buf[18] = byte(in[2] >> 16)
999 - buf[17] = byte(((in[2] >> 24) & 0x0f) | (in[3]<<4)&0xf0)
1001 - buf[16] = byte(in[3] >> 4)
1002 - buf[15] = byte(in[3] >> 12)
1003 - buf[14] = byte(in[3] >> 20)
1005 - buf[13] = byte(in[4])
1006 - buf[12] = byte(in[4] >> 8)
1007 - buf[11] = byte(in[4] >> 16)
1008 - buf[10] = byte(((in[4] >> 24) & 0x0f) | (in[5]<<4)&0xf0)
1010 - buf[9] = byte(in[5] >> 4)
1011 - buf[8] = byte(in[5] >> 12)
1012 - buf[7] = byte(in[5] >> 20)
1014 - buf[6] = byte(in[6])
1015 - buf[5] = byte(in[6] >> 8)
1016 - buf[4] = byte(in[6] >> 16)
1017 - buf[3] = byte(((in[6] >> 24) & 0x0f) | (in[7]<<4)&0xf0)
1019 - buf[2] = byte(in[7] >> 4)
1020 - buf[1] = byte(in[7] >> 12)
1021 - buf[0] = byte(in[7] >> 20)
1023 - return new(big.Int).SetBytes(buf[:])
1025 --- libgo/go/crypto/elliptic/p224_test.go.jj 2012-11-15 18:26:57.000000000 +0100
1026 +++ libgo/go/crypto/elliptic/p224_test.go 2014-03-05 15:29:58.743430988 +0100
1028 -// Copyright 2012 The Go Authors. All rights reserved.
1029 -// Use of this source code is governed by a BSD-style
1030 -// license that can be found in the LICENSE file.
1039 -var toFromBigTests = []string{
1043 - "b70e0cb46bb4bf7f321390b94a03c1d356c01122343280d6105c1d21",
1044 - "706a46d476dcb76798e6046d89474788d164c18032d268fd10704fa6",
1047 -func p224AlternativeToBig(in *p224FieldElement) *big.Int {
1048 - ret := new(big.Int)
1049 - tmp := new(big.Int)
1051 - for i := uint(0); i < 8; i++ {
1052 - tmp.SetInt64(int64(in[i]))
1053 - tmp.Lsh(tmp, 28*i)
1056 - ret.Mod(ret, p224.P)
1060 -func TestToFromBig(t *testing.T) {
1061 - for i, test := range toFromBigTests {
1062 - n, _ := new(big.Int).SetString(test, 16)
1063 - var x p224FieldElement
1064 - p224FromBig(&x, n)
1065 - m := p224ToBig(&x)
1066 - if n.Cmp(m) != 0 {
1067 - t.Errorf("#%d: %x != %x", i, n, m)
1069 - q := p224AlternativeToBig(&x)
1070 - if n.Cmp(q) != 0 {
1071 - t.Errorf("#%d: %x != %x (alternative)", i, n, m)
1075 --- libgo/go/crypto/elliptic/p256.go.jj 2013-11-07 11:59:09.000000000 +0100
1076 +++ libgo/go/crypto/elliptic/p256.go 2014-03-05 15:34:31.910414701 +0100
1077 @@ -233,6 +233,8 @@ func p256ReduceCarry(inout *[p256Limbs]u
1078 inout[7] += carry << 25
1081 +const bottom28Bits = 0xfffffff
1083 // p256Sum sets out = in+in2.
1085 // On entry, in[i]+in2[i] must not overflow a 32-bit word.
1086 @@ -265,6 +267,7 @@ const (
1087 two31m2 = 1<<31 - 1<<2
1088 two31p24m2 = 1<<31 + 1<<24 - 1<<2
1089 two30m27m2 = 1<<30 - 1<<27 - 1<<2
1090 + two31m3 = 1<<31 - 1<<3
1093 // p256Zero31 is 0 mod p.