From: Nicolas Hillegeer <aktau@google.com>
Date: Tue, 29 Mar 2022 00:40:23 +0000 (-0700)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~21
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=50b8f490e1;p=gostls13.git

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

Change-Id: I04d511ed8e3e7ca4a3267f226a0c3e248c0f84a9
---

50b8f490e1701773254fdbfe0e3fea00ff1f2a68
diff --cc src/go/build/build.go
index 4bf46a8970,df505312ce..4ec9ed57a2
--- a/src/go/build/build.go
+++ b/src/go/build/build.go
@@@ -1900,10 -1913,9 +1914,13 @@@ func (ctxt *Context) matchTag(name stri
  	if ctxt.GOOS == "ios" && name == "darwin" {
  		return true
  	}
+ 	if name == "unix" && unixOS[ctxt.GOOS] {
+ 		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
index 785e14cab9,5794e3d25e..ade6519b8d
--- a/src/go/build/deps_test.go
+++ b/src/go/build/deps_test.go
@@@ -444,14 -442,13 +440,19 @@@ var depsRules = 
  	< crypto/x509
  	< crypto/tls;
  
 +	crypto/internal/boring/sig, crypto/internal/boring/fipstls
 +	< crypto/tls/fipsonly;
 +
 +	crypto/internal/boring
 +	< crypto/boring;
 +
  	# crypto-aware packages
  
 -	CRYPTO, DEBUG, go/build, go/types, text/scanner
++	CRYPTO-BORING, DEBUG, go/build, go/types, text/scanner
+ 	< internal/pkgbits
+ 	< go/internal/gcimporter, go/internal/gccgoimporter, go/internal/srcimporter
+ 	< go/importer;
+ 
  	NET, crypto/rand, mime/quotedprintable
  	< mime/multipart;