From: Chressie Himpel <chressie@google.com>
Date: Tue, 8 Feb 2022 09:31:51 +0000 (+0100)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~27
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=74d25c624c01d8deefaf37ee7edb41980d0d5912;p=gostls13.git

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

Change-Id: If6b68df0c90464566e68de6807d15f4b8bec6219
---

74d25c624c01d8deefaf37ee7edb41980d0d5912
diff --cc src/go/build/deps_test.go
index c148f99123,22a04ff537..4a54b689e5
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -400,12 -400,9 +400,12 @@@ var depsRules = 
  	NET, log
  	< net/mail;
  
 -	# CRYPTO is core crypto algorithms - no cgo, fmt, net.
 -	# Unfortunately, stuck with reflect via encoding/binary.
 -	encoding/binary, golang.org/x/sys/cpu, hash
 +	NONE < crypto/internal/boring/sig;
 +	sync/atomic < crypto/internal/boring/fipstls;
 +
 +	encoding/binary, golang.org/x/sys/cpu, hash,
- 	FMT, math/big,
++	FMT, math/big, embed,
 +	CGO, crypto/internal/boring/sig, crypto/internal/boring/fipstls
  	< crypto
  	< crypto/subtle
  	< crypto/internal/subtle