From: Dmitri Shuralyov <dmitshur@golang.org>
Date: Tue, 1 Dec 2020 22:16:25 +0000 (-0500)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~64
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=dea96ada17;p=gostls13.git

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

Change-Id: I31c69e54c904c66c10920e4c4caacfef08bb834f
---

dea96ada1742b45e383dcbb0c2ab4cd0d3fc92a8
diff --cc src/go/build/deps_test.go
index 3a0726a293,bf1367355d..89bae9fd51
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -388,12 -390,12 +388,12 @@@ var depsRules = 
  	< golang.org/x/crypto/curve25519
  	< crypto/dsa, crypto/elliptic, crypto/rsa
  	< crypto/ecdsa
 -	< CRYPTO-MATH;
 +	< CRYPTO-BORING;
  
 -	CGO, net !< CRYPTO-MATH;
 +	net !< CRYPTO-BORING;
  
  	# TLS, Prince of Dependencies.
- 	CGO, CRYPTO-BORING, NET, container/list, encoding/hex, encoding/pem
 -	CRYPTO-MATH, NET, container/list, encoding/hex, encoding/pem
++	CRYPTO-BORING, NET, container/list, encoding/hex, encoding/pem
  	< golang.org/x/crypto/internal/subtle
  	< golang.org/x/crypto/chacha20
  	< golang.org/x/crypto/poly1305