From: Filippo Valsorda <filippo@golang.org>
Date: Thu, 25 Oct 2018 23:30:18 +0000 (-0400)
Subject: [dev.boringcrypto] all: merge master into dev.boringcrypto
X-Git-Tag: go1.19beta1~484^2~134
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=13bf5b80e8d8841a2a3c9b0d5dec65a0c8636253;p=gostls13.git

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

Change-Id: Ia661c871e14445672b7d36a443455302e47cc2a1
---

13bf5b80e8d8841a2a3c9b0d5dec65a0c8636253
diff --cc src/crypto/tls/cipher_suites.go
index e4027e8ab4,e937235876..2475906ae1
--- a/src/crypto/tls/cipher_suites.go
+++ b/src/crypto/tls/cipher_suites.go
@@@ -136,11 -134,7 +135,11 @@@ func macSHA1(version uint16, key []byte
  		copy(mac.key, key)
  		return mac
  	}
 -	return tls10MAC{h: hmac.New(newConstantTimeHash(sha1.New), key)}
 +	h := sha1.New
 +	if !boring.Enabled {
 +		h = newConstantTimeHash(h)
 +	}
- 	return tls10MAC{hmac.New(h, key)}
++	return tls10MAC{h: hmac.New(h, key)}
  }
  
  // macSHA256 returns a SHA-256 based MAC. These are only supported in TLS 1.2