[dev.boringcrypto] all: merge master into dev.boringcrypto

Conflicts due to simple variable renames (d <-> d0):
    src/crypto/sha1/sha1.go
    src/crypto/sha256/sha256.go
    src/crypto/sha512/sha512.go

Change-Id: I437df180a527fb3ec8b47927ee71960d5d200b76

diff --cc src/cmd/compile/internal/gc/reflect.go
Simple merge

diff --cc src/cmd/go/go_test.go
Simple merge

diff --cc src/cmd/go/internal/load/pkg.go
Simple merge

diff --cc src/cmd/link/internal/ld/lib.go
Simple merge

diff --cc src/crypto/rsa/pkcs1v15.go
Simple merge

diff --cc src/crypto/rsa/pss.go
Simple merge

diff --cc src/crypto/rsa/rsa.go
index 9af5cbb16549cc801a35c5c77e239e40ff9903a4,83d74967aa6dd665d57993075d2a0fb0f5421c1d..9302ea8535c6528c5ddfdc21c3dac92396509c0c
--- 1/src/crypto/rsa/rsa.go
--- 2/src/crypto/rsa/rsa.go
+++ b/src/crypto/rsa/rsa.go
@@@ -42,10 -40,14 +42,16 @@@ var bigOne = big.NewInt(1
  type PublicKey struct {
        N *big.Int // modulus
        E int      // public exponent
 +
 +      boring unsafe.Pointer
  }
  
+ // Size returns the modulus size in bytes. Raw signatures and ciphertexts
+ // for or by this public key will have the same size.
+ func (pub *PublicKey) Size() int {
+       return (pub.N.BitLen() + 7) / 8
+ }
+ 
  // OAEPOptions is an interface for passing options to OAEP decryption using the
  // crypto.Decrypter interface.
  type OAEPOptions struct {

diff --cc src/crypto/sha1/sha1.go
index 1588684950d3406e8af65eb01fb3253780249cf8,db70b7d09aa8c52c9b629f7e9e085eb53c763ffd..a9546bb0a50e53402f277e30ff27c9310be30ae1
--- 1/src/crypto/sha1/sha1.go
--- 2/src/crypto/sha1/sha1.go
+++ b/src/crypto/sha1/sha1.go
@@@ -154,11 -150,10 +154,11 @@@ func (d *digest) Write(p []byte) (nn in
        return
  }
  
- func (d0 *digest) Sum(in []byte) []byte {
+ func (d *digest) Sum(in []byte) []byte {
 +      boringUnreachable()
-       // Make a copy of d0 so that caller can keep writing and summing.
-       d := *d0
-       hash := d.checkSum()
+       // Make a copy of d so that caller can keep writing and summing.
+       d0 := *d
+       hash := d0.checkSum()
        return append(in, hash[:]...)
  }
  

diff --cc src/crypto/sha256/sha256.go
index ce731fbf2cb29249cf9f70c25a20b279a5402355,1389de272771c8b5f7e72c0382fc4d30519e4334..6ac585f79507f647ccfe51cad7a031ac53027c94
--- 1/src/crypto/sha256/sha256.go
--- 2/src/crypto/sha256/sha256.go
+++ b/src/crypto/sha256/sha256.go
@@@ -223,12 -223,11 +231,12 @@@ func (d *digest) Write(p []byte) (nn in
        return
  }
  
- func (d0 *digest) Sum(in []byte) []byte {
+ func (d *digest) Sum(in []byte) []byte {
 +      boring.Unreachable()
-       // Make a copy of d0 so that caller can keep writing and summing.
-       d := *d0
-       hash := d.checkSum()
-       if d.is224 {
+       // Make a copy of d so that caller can keep writing and summing.
+       d0 := *d
+       hash := d0.checkSum()
+       if d0.is224 {
                return append(in, hash[:Size224]...)
        }
        return append(in, hash[:]...)

diff --cc src/crypto/sha512/sha512.go
index 97c07f8a6b98636102720ee1b6ead3f8fbb805f1,24fde7dce708b85094df8b5869bc9a8808109919..355d7bbe0731ff5f1a088a01a511652dec4e8876
--- 1/src/crypto/sha512/sha512.go
--- 2/src/crypto/sha512/sha512.go
+++ b/src/crypto/sha512/sha512.go
@@@ -292,15 -286,12 +296,15 @@@ func (d *digest) Write(p []byte) (nn in
        return
  }
  
- func (d0 *digest) Sum(in []byte) []byte {
-       if d0.function != crypto.SHA512_224 && d0.function != crypto.SHA512_256 {
+ func (d *digest) Sum(in []byte) []byte {
++      if d.function != crypto.SHA512_224 && d.function != crypto.SHA512_256 {
 +              boring.Unreachable()
 +      }
-       // Make a copy of d0 so that caller can keep writing and summing.
-       d := new(digest)
-       *d = *d0
-       hash := d.checkSum()
-       switch d.function {
+       // Make a copy of d so that caller can keep writing and summing.
+       d0 := new(digest)
+       *d0 = *d
+       hash := d0.checkSum()
+       switch d0.function {
        case crypto.SHA384:
                return append(in, hash[:Size384]...)
        case crypto.SHA512_224:

diff --cc src/crypto/tls/cipher_suites.go
Simple merge

diff --cc src/crypto/tls/common.go
Simple merge

diff --cc src/crypto/tls/handshake_client.go
Simple merge

diff --cc src/crypto/tls/handshake_server.go
Simple merge

diff --cc src/crypto/tls/prf.go
Simple merge

diff --cc src/crypto/x509/verify.go
Simple merge

diff --cc src/go/build/deps_test.go
Simple merge