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

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

diff --git a/src/crypto/tls/boring.go b/src/crypto/tls/boring.go
index 791049f0d3ad0015ccb041e009d82ada186ea2ba..f6d922c673f5e99b9bfc3cee8d71723544912116 100644 (file)
--- a/src/crypto/tls/boring.go
+++ b/src/crypto/tls/boring.go
@@ -106,16 +106,16 @@ func isBoringCertificate(c *x509.Certificate) bool {
 // supportedSignatureAlgorithms returns the supported signature algorithms.
 // It knows that the FIPS-allowed ones are all at the beginning of
 // defaultSupportedSignatureAlgorithms.
-func supportedSignatureAlgorithms() []signatureAndHash {
+func supportedSignatureAlgorithms() []SignatureScheme {
        all := defaultSupportedSignatureAlgorithms
        if !needFIPS() {
                return all
        }
        i := 0
-       for i < len(all) && all[i].hash != hashSHA1 {
+       for i < len(all) && all[i] != PKCS1WithSHA1 {
                i++
        }
        return all[:i]
 }
 
-var testingOnlyForceClientHelloSignatureAndHashes []signatureAndHash
+var testingOnlyForceClientHelloSignatureAlgorithms []SignatureScheme