From: Katie Hockman <katie@golang.org>
Date: Tue, 3 Sep 2019 21:04:59 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~105
X-Git-Url: http://www.git.cypherpunks.ru/?a=commitdiff_plain;h=ff197f326fe607bba27a0b53e47b7a565601569d;p=gostls13.git

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

Change-Id: I3cd94be655e5374b52494f756ff087352705da6d
---

ff197f326fe607bba27a0b53e47b7a565601569d
diff --cc src/crypto/tls/common.go
index f7e0f8e164,ef0b385848..121c1d9d23
--- a/src/crypto/tls/common.go
+++ b/src/crypto/tls/common.go
@@@ -22,10 -22,7 +22,9 @@@ import 
  	"time"
  )
  
 +import "crypto/internal/boring"
 +
  const (
- 	VersionSSL30 = 0x0300
  	VersionTLS10 = 0x0301
  	VersionTLS11 = 0x0302
  	VersionTLS12 = 0x0303
@@@ -796,9 -794,10 +799,13 @@@ var supportedVersions = []uint16
  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
 +		}
+ 		// TLS 1.0 is the default minimum version.
+ 		if (c == nil || c.MinVersion == 0) && v < VersionTLS10 {
+ 			continue
+ 		}
  		if c != nil && c.MinVersion != 0 && v < c.MinVersion {
  			continue
  		}