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

Change-Id: I0596a40722bf62952bd2eba85ccf3f104de589e4

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/x509/verify.go
index d47f8382ae2156bfa11c3dae3b2171ec54bba673,cb8d8f872dd4d79b520491b4e01d7519815920e7..50f4d4ac807821dbf81907ca11e1d4588b516a95
--- 1/src/crypto/x509/verify.go
--- 2/src/crypto/x509/verify.go
+++ b/src/crypto/x509/verify.go
@@@ -193,13 -193,8 +193,13 @@@ var errNotParsed = errors.New("x509: mi
  
  // VerifyOptions contains parameters for Certificate.Verify.
  type VerifyOptions struct {
 +      // IsBoring is a validity check for BoringCrypto.
 +      // If not nil, it will be called to check whether a given certificate
 +      // can be used for constructing verification chains.
 +      IsBoring func(*Certificate) bool
 +
        // DNSName, if set, is checked against the leaf certificate with
-       // Certificate.VerifyHostname.
+       // Certificate.VerifyHostname or the platform verifier.
        DNSName string
  
        // Intermediates is an optional pool of certificates that are not trust

diff --cc src/go/build/build.go
index 0a606161ca39f896844fd53054da53882fb76d1b,5c3d8761305974fe04290fdb9253843c0bd6424d..d58319583aeee4e5d4b7463d51ab5cc66f900f19
--- 1/src/go/build/build.go
--- 2/src/go/build/build.go
+++ b/src/go/build/build.go
@@@ -1749,10 -1754,9 +1755,13 @@@ func (ctxt *Context) match(name string
        if ctxt.GOOS == "illumos" && name == "solaris" {
                return true
        }
+       if ctxt.GOOS == "ios" && name == "darwin" {
+               return true
+       }
 +      // Let applications know that the Go+BoringCrypto toolchain is in use.
 +      if name == "boringcrypto" {
 +              return true
 +      }
  
        // other tags
        for _, tag := range ctxt.BuildTags {

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