From: Chressie Himpel <chressie@google.com>
Date: Wed, 27 Apr 2022 18:09:28 +0000 (+0200)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~12
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=ec7f5165ddc680efbac18dc15b4905844d9e8db9;p=gostls13.git

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

Change-Id: Ic5f71c04f08c03319c043f35be501875adb0a3b0
---

ec7f5165ddc680efbac18dc15b4905844d9e8db9
diff --cc src/crypto/tls/common.go
index fdcebd8a06,59b41effbe..1861efce66
--- a/src/crypto/tls/common.go
+++ b/src/crypto/tls/common.go
@@@ -988,10 -981,7 +984,10 @@@ const roleServer = fals
  func (c *Config) supportedVersions(isClient bool) []uint16 {
  	versions := make([]uint16, 0, len(supportedVersions))
  	for _, v := range supportedVersions {
 +		if needFIPS() && (v < fipsMinVersion(c) || v > fipsMaxVersion(c)) {
 +			continue
 +		}
- 		if (c == nil || c.MinVersion == 0) && !debugEnableTLS10 &&
+ 		if (c == nil || c.MinVersion == 0) &&
  			isClient && v < VersionTLS12 {
  			continue
  		}