[dev.boringcrypto] all: merge master (nearly Go 1.10 beta 1) into dev.boringcrypto

[gostls13.git] / src / crypto / tls / key_agreement.go

diff --git a/src/crypto/tls/key_agreement.go b/src/crypto/tls/key_agreement.go
index 3f570b66c69275d45b84900c7930bd1d1f092618..a168c5b260623cfdd079cd7cfff67b020861658e 100644 (file)
--- a/src/crypto/tls/key_agreement.go
+++ b/src/crypto/tls/key_agreement.go
@@ -114,7 +114,7 @@ func md5SHA1Hash(slices [][]byte) []byte {
 // is only used for >= TLS 1.2 and identifies the hash function to use.
 func hashForServerKeyExchange(sigType uint8, signatureAlgorithm SignatureScheme, version uint16, slices ...[]byte) ([]byte, crypto.Hash, error) {
        if version >= VersionTLS12 {
-               if !isSupportedSignatureAlgorithm(signatureAlgorithm, supportedSignatureAlgorithms) {
+               if !isSupportedSignatureAlgorithm(signatureAlgorithm, supportedSignatureAlgorithms()) {
                        return nil, crypto.Hash(0), errors.New("tls: unsupported hash function used by peer")
                }
                hashFunc, err := lookupTLSHash(signatureAlgorithm)
@@ -156,7 +156,7 @@ func pickTLS12HashForSignature(sigType uint8, clientList []SignatureScheme) (Sig
                if signatureFromSignatureScheme(sigAlg) != sigType {
                        continue
                }
-               if isSupportedSignatureAlgorithm(sigAlg, supportedSignatureAlgorithms) {
+               if isSupportedSignatureAlgorithm(sigAlg, supportedSignatureAlgorithms()) {
                        return sigAlg, nil
                }
        }