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

Change-Id: Iaf618444dd2d99721c19708df9ce2c1f35854efd

diff --cc api/next/46057.txt
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d971aa7ffd9937b54de1c9e5a0c395082e22ca20
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/api/next/46057.txt
@@@ -1,0 -1,0 +1,1 @@@
++pkg crypto/x509, method (*CertPool) Equal(*CertPool) bool #46057

diff --cc src/cmd/compile/internal/amd64/versions_test.go
Simple merge

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

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

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

diff --cc src/crypto/rand/rand_unix.go
Simple merge

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

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

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

diff --cc src/go/build/deps_test.go
index ade6519b8d76f0be2ca9ba6056c3a4e28ae2b4b7,052e7ad9c0d821975e18d4fddc1fe214cd301451..f318f6e43255093548971d6b83afa5d0f23ed059
--- 1/src/go/build/deps_test.go
--- 2/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -412,13 -408,18 +411,13 @@@ var depsRules = 
        < crypto/ed25519/internal/edwards25519/field, golang.org/x/crypto/curve25519/internal/field
        < crypto/ed25519/internal/edwards25519
        < crypto/cipher
 +      < encoding/asn1
 +      < crypto/internal/boring
        < crypto/aes, crypto/des, crypto/hmac, crypto/md5, crypto/rc4,
          crypto/sha1, crypto/sha256, crypto/sha512
-       < crypto/rand
 -      < CRYPTO;
 -
 -      CGO, fmt, net !< CRYPTO;
 -
 -      # CRYPTO-MATH is core bignum-based crypto - no cgo, net; fmt now ok.
 -      CRYPTO, FMT, math/big, embed
        < crypto/internal/randutil
+       < crypto/rand
        < crypto/ed25519
 -      < encoding/asn1
        < golang.org/x/crypto/cryptobyte/asn1
        < golang.org/x/crypto/cryptobyte
        < golang.org/x/crypto/curve25519