Merge branch 'tmp-rsa-pss-tls12' into 'master'

tls-sig: check RSA-PSS signature key compatibility also in TLS 1.2

Closes #659 and #645

See merge request gnutls/gnutls!854

3 files changed, 2 insertions, 4 deletions

diff --git a/tests/suite/tls-fuzzer/gnutls-cert.json b/tests/suite/tls-fuzzer/gnutls-cert.json
index f9de174699..c2b28c5569 100644
--- a/tests/suite/tls-fuzzer/gnutls-cert.json
+++ b/tests/suite/tls-fuzzer/gnutls-cert.json
@@ -37,13 +37,11 @@
                          "-p", "@PORT@"]
           },
          {"name" : "test-rsa-pss-sigs-on-certificate-verify.py",
-	  "comment" : "FIXME: We shouldn't allow rsa_pss_pss* schemes as there is only RSA key #645",
+	  "comment": "tlsfuzzer doesn't know ed25519 scheme which we advertise",
           "arguments" : ["-k", "tests/clientX509Key.pem",
                          "-c", "tests/clientX509Cert.pem",
                          "-e", "check CertificateRequest sigalgs",
-			 "-e", "rsa_pss_pss_sha256 in CertificateVerify with rsa key",
-			 "-e", "rsa_pss_pss_sha384 in CertificateVerify with rsa key",
-			 "-e", "rsa_pss_pss_sha512 in CertificateVerify with rsa key",
+                         "--illegpar",
                          "-n", "100",
                          "-p", "@PORT@"]
           },
diff --git a/tests/suite/tls-fuzzer/tlsfuzzer b/tests/suite/tls-fuzzer/tlsfuzzer
-Subproject cd624f68c671f339b3a1e0ef90db984760bcfea
+Subproject b9dec4fde7bedfac90850b86c2c3f644349f6c3
diff --git a/tests/suite/tls-fuzzer/tlslite-ng b/tests/suite/tls-fuzzer/tlslite-ng
-Subproject d00ad94272be90172ecc5c422c923d679c23416
+Subproject 3696909715ba73ee807d3959a26d36b56f718ba