Add support for RSA-PSS to the TLS 1.3 Go code.

(Of course, it's still signing ServerKeyExchange messages since the
handshake's the old one.)

Change-Id: I35844a329d983f61ed0b5be20b333487406fe7e4
Reviewed-on: https://boringssl-review.googlesource.com/8614
Reviewed-by: David Benjamin <davidben@google.com>

2 files changed, 52 insertions, 3 deletions

diff --git a/ssl/test/runner/common.go b/ssl/test/runner/common.go
index 19650913..f63d3461 100644
--- a/ssl/test/runner/common.go
+++ b/ssl/test/runner/common.go
@@ -900,6 +900,10 @@ type ProtocolBugs struct {
 	// SkipECDSACurveCheck, if true, causes all ECDSA curve checks to be
 	// skipped.
 	SkipECDSACurveCheck bool
+
+	// IgnoreSignatureVersionChecks, if true, causes all signature
+	// algorithms to be enabled at all TLS versions.
+	IgnoreSignatureVersionChecks bool
 }
 
 func (c *Config) serverInit() {
diff --git a/ssl/test/runner/sign.go b/ssl/test/runner/sign.go
index ec1738e8..6a53958f 100644
--- a/ssl/test/runner/sign.go
+++ b/ssl/test/runner/sign.go
@@ -198,6 +198,39 @@ func (e *ecdsaSigner) verifyMessage(key crypto.PublicKey, msg, sig []byte) error
 	return nil
 }
 
+var pssOptions = rsa.PSSOptions{SaltLength: rsa.PSSSaltLengthEqualsHash}
+
+type rsaPSSSigner struct {
+	hash crypto.Hash
+}
+
+func (r *rsaPSSSigner) supportsKey(key crypto.PrivateKey) bool {
+	_, ok := key.(*rsa.PrivateKey)
+	return ok
+}
+
+func (r *rsaPSSSigner) signMessage(key crypto.PrivateKey, config *Config, msg []byte) ([]byte, error) {
+	rsaKey, ok := key.(*rsa.PrivateKey)
+	if !ok {
+		return nil, errors.New("invalid key type for RSA-PSS")
+	}
+
+	h := r.hash.New()
+	h.Write(msg)
+	return rsa.SignPSS(config.rand(), rsaKey, r.hash, h.Sum(nil), &pssOptions)
+}
+
+func (r *rsaPSSSigner) verifyMessage(key crypto.PublicKey, msg, sig []byte) error {
+	rsaKey, ok := key.(*rsa.PublicKey)
+	if !ok {
+		return errors.New("invalid key type for RSA-PSS")
+	}
+
+	h := r.hash.New()
+	h.Write(msg)
+	return rsa.VerifyPSS(rsaKey, r.hash, h.Sum(nil), sig, &pssOptions)
+}
+
 func getSigner(version uint16, key interface{}, config *Config, sigAlg signatureAlgorithm) (signer, error) {
 	// TLS 1.1 and below use legacy signature algorithms.
 	if version < VersionTLS12 {
@@ -211,7 +244,7 @@ func getSigner(version uint16, key interface{}, config *Config, sigAlg signature
 		}
 	}
 
-	// TODO(davidben): Implement RSA-PSS for TLS 1.3.
+	// TODO(davidben): Forbid RSASSA-PKCS1-v1_5 in TLS 1.3.
 	switch sigAlg {
 	case signatureRSAPKCS1WithMD5:
 		return &rsaPKCS1Signer{crypto.MD5}, nil
@@ -231,7 +264,19 @@ func getSigner(version uint16, key interface{}, config *Config, sigAlg signature
 		return &ecdsaSigner{version, config, elliptic.P384(), crypto.SHA384}, nil
 	case signatureECDSAWithP521AndSHA512:
 		return &ecdsaSigner{version, config, elliptic.P521(), crypto.SHA512}, nil
-	default:
-		return nil, fmt.Errorf("unsupported signature algorithm %04x", sigAlg)
+	case signatureRSAPSSWithSHA256:
+		if version >= VersionTLS13 || config.Bugs.IgnoreSignatureVersionChecks {
+			return &rsaPSSSigner{crypto.SHA256}, nil
+		}
+	case signatureRSAPSSWithSHA384:
+		if version >= VersionTLS13 || config.Bugs.IgnoreSignatureVersionChecks {
+			return &rsaPSSSigner{crypto.SHA384}, nil
+		}
+	case signatureRSAPSSWithSHA512:
+		if version >= VersionTLS13 || config.Bugs.IgnoreSignatureVersionChecks {
+			return &rsaPSSSigner{crypto.SHA512}, nil
+		}
 	}
+
+	return nil, fmt.Errorf("unsupported signature algorithm %04x", sigAlg)
 }