]> Cypherpunks.ru repositories - gostls13.git/commitdiff
[dev.boringcrypto] all: merge master into dev.boringcrypto
authorKatie Hockman <katie@golang.org>
Tue, 3 Sep 2019 21:04:59 +0000 (17:04 -0400)
committerKatie Hockman <katie@golang.org>
Tue, 3 Sep 2019 21:05:23 +0000 (17:05 -0400)
Change-Id: I3cd94be655e5374b52494f756ff087352705da6d

1  2 
src/cmd/compile/internal/gc/reflect.go
src/cmd/go/go_test.go
src/cmd/go/internal/load/pkg.go
src/cmd/link/internal/ld/lib.go
src/crypto/rsa/rsa.go
src/crypto/tls/common.go
src/go/build/deps_test.go

Simple merge
Simple merge
Simple merge
Simple merge
index f7e0f8e1648ab27c2c1cca95b5a7f9ef3279589b,ef0b38584876c6b91ce445296959e893a8406268..121c1d9d234f10704b265e56a7739fecd0951758
@@@ -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
                }
Simple merge