开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 15

ecdsa.patch Changed

@@ -1,801 +1,147 @@
 diff --git a/ecdsa.go.org b/ecdsa.go
-index 9f9a09a..8d057cb 100755
+index 9f9a09a..ff0c387 100755
 --- external/go_sdk/src/crypto/ecdsa/ecdsa.go
 +++ external/go_sdk/src/crypto/ecdsa/ecdsa.go
-@@ -1,368 +1,427 @@
--// Copyright 2011 The Go Authors. All rights reserved.
--// Use of this source code is governed by a BSD-style
--// license that can be found in the LICENSE file.
--
--// Package ecdsa implements the Elliptic Curve Digital Signature Algorithm, as
--// defined in FIPS 186-4 and SEC 1, Version 2.0.
--//
--// Signatures generated by this package are not deterministic, but entropy is
--// mixed with the private key and the message, achieving the same level of
--// security in case of randomness source failure.
--package ecdsa
--
--// FIPS 186-4 references ANSI X9.62-2005 for the bulk of the ECDSA algorithm.
--// That standard is not freely available, which is a problem in an open source
--// implementation, because not only the implementer, but also any maintainer,
--// contributor, reviewer, auditor, and learner needs access to it. Instead, this
--// package references and follows the equivalent SEC 1, Version 2.0.
--//
--// FIPS 186-4: https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf
--// SEC 1, Version 2.0: https://www.secg.org/sec1-v2.pdf
--
--import (
--	"crypto"
--	"crypto/aes"
--	"crypto/cipher"
--	"crypto/elliptic"
--	"crypto/internal/randutil"
--	"crypto/sha512"
--	"errors"
--	"io"
--	"math/big"
--
--	"golang.org/x/crypto/cryptobyte"
--	"golang.org/x/crypto/cryptobyte/asn1"
--)
--
--// A invertible implements fast inverse in GF(N).
--type invertible interface {
--	// Inverse returns the inverse of k mod Params().N.
--	Inverse(k *big.Int) *big.Int
--}
--
--// A combinedMult implements fast combined multiplication for verification.
--type combinedMult interface {
--	// CombinedMult returns s1G + s2P where G is the generator.
--	CombinedMult(Px, Py *big.Int, s1, s2 byte) (x, y *big.Int)
--}
--
--const (
--	aesIV = "IV for ECDSA CTR"
--)
--
--// PublicKey represents an ECDSA public key.
--type PublicKey struct {
--	elliptic.Curve
--	X, Y *big.Int
--}
--
--// Any methods implemented on PublicKey might need to also be implemented on
--// PrivateKey, as the latter embeds the former and will expose its methods.
--
--// Equal reports whether pub and x have the same value.
--//
--// Two keys are only considered to have the same value if they have the same Curve value.
--// Note that for example elliptic.P256() and elliptic.P256().Params() are different
--// values, as the latter is a generic not constant time implementation.
--func (pub *PublicKey) Equal(x crypto.PublicKey) bool {
--	xx, ok := x.(*PublicKey)
--	if !ok {
--		return false
--	}
--	return pub.X.Cmp(xx.X) == 0 && pub.Y.Cmp(xx.Y) == 0 &&
--		// Standard library Curve implementations are singletons, so this check
--		// will work for those. Other Curves might be equivalent even if not
--		// singletons, but there is no definitive way to check for that, and
--		// better to err on the side of safety.
--		pub.Curve == xx.Curve
--}
--
--// PrivateKey represents an ECDSA private key.
--type PrivateKey struct {
--	PublicKey
--	D *big.Int
--}
--
--// Public returns the public key corresponding to priv.
--func (priv *PrivateKey) Public() crypto.PublicKey {
--	return &priv.PublicKey
--}
--
--// Equal reports whether priv and x have the same value.
--//
--// See PublicKey.Equal for details on how Curve is compared.
--func (priv *PrivateKey) Equal(x crypto.PrivateKey) bool {
--	xx, ok := x.(*PrivateKey)
--	if !ok {
--		return false
--	}
--	return priv.PublicKey.Equal(&xx.PublicKey) && priv.D.Cmp(xx.D) == 0
--}
--
--// Sign signs digest with priv, reading randomness from rand. The opts argument
--// is not currently used but, in keeping with the crypto.Signer interface,
--// should be the hash function used to digest the message.
--//
--// This method implements crypto.Signer, which is an interface to support keys
--// where the private part is kept in, for example, a hardware module. Common
--// uses can use the SignASN1 function in this package directly.
--func (priv *PrivateKey) Sign(rand io.Reader, digest byte, opts crypto.SignerOpts) (byte, error) {
--	r, s, err := Sign(rand, priv, digest)
--	if err != nil {
--		return nil, err
--	}
--
--	var b cryptobyte.Builder
--	b.AddASN1(asn1.SEQUENCE, func(b *cryptobyte.Builder) {
--		b.AddASN1BigInt(r)
--		b.AddASN1BigInt(s)
--	})
--	return b.Bytes()
--}
--
--var one = new(big.Int).SetInt64(1)
--
--// randFieldElement returns a random element of the order of the given
--// curve using the procedure given in FIPS 186-4, Appendix B.5.1.
--func randFieldElement(c elliptic.Curve, rand io.Reader) (k *big.Int, err error) {
--	params := c.Params()
--	// Note that for P-521 this will actually be 63 bits more than the order, as
--	// division rounds down, but the extra bit is inconsequential.
+@@ -24,6 +24,8 @@ import (
+ 	"crypto/aes"
+ 	"crypto/cipher"
+ 	"crypto/elliptic"
++	"crypto/internal/boring"
++	"crypto/internal/boring/bbig"
+ 	"crypto/internal/randutil"
+ 	"crypto/sha512"
+ 	"errors"
+@@ -107,6 +109,15 @@ func (priv *PrivateKey) Equal(x crypto.PrivateKey) bool {
+ // where the private part is kept in, for example, a hardware module. Common
+ // uses can use the SignASN1 function in this package directly.
+ func (priv *PrivateKey) Sign(rand io.Reader, digest byte, opts crypto.SignerOpts) (byte, error) {
++	if boring.Enabled && rand == boring.RandReader {
++		b, err := boringPrivateKey(priv)
++		if err != nil {
++			return nil, err
++		}
++		return boring.SignMarshalECDSA(b, digest)
++	}
++	boring.UnreachableExceptTests()
++
+ 	r, s, err := Sign(rand, priv, digest)
+ 	if err != nil {
+ 		return nil, err
+@@ -128,7 +139,7 @@ func randFieldElement(c elliptic.Curve, rand io.Reader) (k *big.Int, err error)
+ 	params := c.Params()
+ 	// Note that for P-521 this will actually be 63 bits more than the order, as
+ 	// division rounds down, but the extra bit is inconsequential.
 -	b := make(byte, params.BitSize/8+8) // TODO: use params.N.BitLen()
--	_, err = io.ReadFull(rand, b)
--	if err != nil {
--		return
--	}
--
--	k = new(big.Int).SetBytes(b)
--	n := new(big.Int).Sub(params.N, one)
--	k.Mod(k, n)
--	k.Add(k, one)
--	return
--}
--
--// GenerateKey generates a public and private key pair.
--func GenerateKey(c elliptic.Curve, rand io.Reader) (*PrivateKey, error) {
--	k, err := randFieldElement(c, rand)
--	if err != nil {
--		return nil, err
--	}
--
--	priv := new(PrivateKey)
--	priv.PublicKey.Curve = c
--	priv.D = k
--	priv.PublicKey.X, priv.PublicKey.Y = c.ScalarBaseMult(k.Bytes())
--	return priv, nil
--}
--
--// hashToInt converts a hash value to an integer. Per FIPS 186-4, Section 6.4,
--// we use the left-most bits of the hash to match the bit-length of the order of
--// the curve. This also performs Step 5 of SEC 1, Version 2.0, Section 4.1.3.
--func hashToInt(hash byte, c elliptic.Curve) *big.Int {
--	orderBits := c.Params().N.BitLen()
--	orderBytes := (orderBits + 7) / 8
--	if len(hash) > orderBytes {