Add a test for mismatch between the pkey and sigalg

We add a test for sending an mldsa65 sigalg while using an mldsa44 key.

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/29019)

(cherry picked from commit 236bc0d2f919bcd6a91c7dc8a0a3a1088089d1c8)

diff --git a/test/recipes/70-test_sslsigalgs.t b/test/recipes/70-test_sslsigalgs.t
index 10e7cd1479f927e333da725f05fedb1aacdef233..765b0a58d9ac4082c95c4ad6e7db41bb9d6f3630 100644 (file)
--- a/test/recipes/70-test_sslsigalgs.t
+++ b/test/recipes/70-test_sslsigalgs.t
@@ -45,7 +45,9 @@ use constant {
     SIGALGS_CERT_PKCS => 8,
     SIGALGS_CERT_INVALID => 9,
     UNRECOGNIZED_SIGALGS_CERT => 10,
-    UNRECOGNIZED_SIGALG => 11
+    UNRECOGNIZED_SIGALG => 11,
+    RSAPSSPSS_SIG_ALG => 12,
+    MLDSA65_SIG_ALG => 13
 };
 
 srand(70);
@@ -67,12 +69,12 @@ sub randcase {
 #Test 1: Default sig algs should succeed
 $proxy->clientflags("-no_tls1_3") if disabled("ec") && disabled("dh");
 $proxy->start() or plan skip_all => "Unable to start up Proxy for tests";
-plan tests => 26;
+plan tests => 27;
 ok(TLSProxy::Message->success, "Default sigalgs");
 my $testtype;
 
 SKIP: {
-    skip "TLSv1.3 disabled", 6
+    skip "TLSv1.3 disabled", 7
         if disabled("tls1_3") || (disabled("ec") && disabled("dh"));
 
     $proxy->filter(\&sigalgs_filter);
@@ -115,15 +117,35 @@ SKIP: {
     #        in the certificate is rsaEncryption and not rsassaPss
     $proxy->filter(\&modify_cert_verify_sigalg);
     $proxy->clear();
+    $testtype = RSAPSSPSS_SIG_ALG;
     $proxy->start();
     ok(TLSProxy::Message->fail,
        "Mismatch between CertVerify sigalg and public key OID");
+
+    SKIP: {
+        skip "ML-DSA disabled", 1
+            if disabled("ml-dsa");
+
+        #Test 8: Modify the CertificateVerify sigalg from mldsa44 to mldsa65.
+        #        This should fail because the public key in the certificate is
+        #        for the wrong type of ML-DSA
+        $proxy->filter(\&modify_cert_verify_sigalg);
+        $proxy->clear();
+        $testtype = MLDSA65_SIG_ALG;
+        $proxy->serverflags("-cert " . srctop_file("test", "certs",
+                                                   "server-ml-dsa-44-cert.pem") .
+                            " -key " . srctop_file("test", "certs",
+                                                   "server-ml-dsa-44-key.pem")),
+        $proxy->start();
+        ok(TLSProxy::Message->fail,
+            "Mismatch between CertVerify sigalg and public key OID (ML-DSA)");
+    }
 }
 
 SKIP: {
     skip "EC or TLSv1.3 disabled", 1
         if disabled("tls1_3") || disabled("ec");
-    #Test 8: Sending a valid sig algs list but not including a sig type that
+    #Test 9: Sending a valid sig algs list but not including a sig type that
     #        matches the certificate should fail in TLSv1.3.
     $proxy->clear();
     $proxy->clientflags("-sigalgs ".randcase("ECDSA+SHA256"));
@@ -136,8 +158,8 @@ SKIP: {
     skip "EC, TLSv1.3 or TLSv1.2 disabled", 1
         if disabled("tls1_2") || disabled("tls1_3") || disabled("ec");
 
-    #Test 9: Sending a full list of TLSv1.3 sig algs but negotiating TLSv1.2
-    #        should succeed
+    #Test 10: Sending a full list of TLSv1.3 sig algs but negotiating TLSv1.2
+    #         should succeed
     $proxy->clear();
     $proxy->serverflags("-no_tls1_3");
     $proxy->ciphers("ECDHE-RSA-AES128-SHA");
@@ -151,7 +173,7 @@ SKIP: {
 
     $proxy->filter(\&sigalgs_filter);
 
-    #Test 10: Sending no sig algs extension in TLSv1.2 will make it use
+    #Test 11: Sending no sig algs extension in TLSv1.2 will make it use
     #         SHA1, which is only supported at security level 0.
     $proxy->clear();
     $testtype = NO_SIG_ALGS_EXT;
@@ -160,7 +182,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "No TLSv1.2 sigalgs seclevel 0");
 
-    #Test 11: Sending no sig algs extension in TLSv1.2 should fail at security
+    #Test 12: Sending no sig algs extension in TLSv1.2 should fail at security
     #         level 1 since it will try to use SHA1. Testing client at level 0,
     #         server level 1.
     $proxy->clear();
@@ -170,7 +192,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No TLSv1.2 sigalgs server seclevel 1");
 
-    #Test 12: Sending no sig algs extension in TLSv1.2 should fail at security
+    #Test 13: Sending no sig algs extension in TLSv1.2 should fail at security
     #         level 1 since it will try to use SHA1. Testing client at level 1,
     #         server level 0.
     $proxy->clear();
@@ -180,7 +202,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No TLSv1.2 sigalgs client seclevel 2");
 
-    #Test 13: Sending an empty sig algs extension in TLSv1.2 should fail
+    #Test 14: Sending an empty sig algs extension in TLSv1.2 should fail
     $proxy->clear();
     $testtype = EMPTY_SIG_ALGS_EXT;
     $proxy->clientflags("-no_tls1_3");
@@ -188,7 +210,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "Empty TLSv1.2 sigalgs");
 
-    #Test 14: Sending a list with no recognised sig algs in TLSv1.2 should fail
+    #Test 15: Sending a list with no recognised sig algs in TLSv1.2 should fail
     $proxy->clear();
     $testtype = NO_KNOWN_SIG_ALGS;
     $proxy->clientflags("-no_tls1_3");
@@ -196,7 +218,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "No known TLSv1.3 sigalgs");
 
-    #Test 15: Sending a sig algs list without pss for an RSA cert in TLSv1.2
+    #Test 16: Sending a sig algs list without pss for an RSA cert in TLSv1.2
     #         should succeed
     $proxy->clear();
     $testtype = NO_PSS_SIG_ALGS;
@@ -205,7 +227,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "No PSS TLSv1.2 sigalgs");
 
-    #Test 16: Sending only TLSv1.3 PSS sig algs in TLSv1.2 should succeed
+    #Test 17: Sending only TLSv1.3 PSS sig algs in TLSv1.2 should succeed
     $proxy->clear();
     $testtype = PSS_ONLY_SIG_ALGS;
     $proxy->serverflags("-no_tls1_3");
@@ -213,7 +235,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success, "PSS only sigalgs in TLSv1.2");
 
-    #Test 17: Responding with a sig alg we did not send in TLSv1.2 should fail
+    #Test 18: Responding with a sig alg we did not send in TLSv1.2 should fail
     #         We send rsa_pkcs1_sha256 and respond with rsa_pss_rsae_sha256
     #         TODO(TLS1.3): Add a similar test to the TLSv1.3 section above
     #         when we have an API capable of configuring the TLSv1.3 sig algs
@@ -224,7 +246,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->fail, "Sigalg we did not send in TLSv1.2");
 
-    #Test 18: Sending a valid sig algs list but not including a sig type that
+    #Test 19: Sending a valid sig algs list but not including a sig type that
     #         matches the certificate should fail in TLSv1.2
     $proxy->clear();
     $proxy->clientflags("-no_tls1_3 -sigalgs ".randcase("ECDSA+SHA256"));
@@ -234,7 +256,7 @@ SKIP: {
     ok(TLSProxy::Message->fail, "No matching TLSv1.2 sigalgs");
     $proxy->filter(\&sigalgs_filter);
 
-    #Test 19: No sig algs extension, ECDSA cert, will use SHA1,
+    #Test 20: No sig algs extension, ECDSA cert, will use SHA1,
     #         TLSv1.2 should succeed at security level 0
     $proxy->clear();
     $testtype = NO_SIG_ALGS_EXT;
@@ -254,7 +276,7 @@ SKIP: {
         if disabled("tls1_3")
            || disabled("dsa")
            || (disabled("ec") && disabled("dh"));
-    #Test 20: signature_algorithms with 1.3-only ClientHello
+    #Test 21: signature_algorithms with 1.3-only ClientHello
     $testtype = PURE_SIGALGS;
     $dsa_status = $sha1_status = $sha224_status = 0;
     $proxy->clear();
@@ -264,7 +286,7 @@ SKIP: {
     ok($dsa_status && $sha1_status && $sha224_status,
        "DSA and SHA1 sigalgs not sent for 1.3-only ClientHello");
 
-    #Test 21: signature_algorithms with backwards compatible ClientHello
+    #Test 22: signature_algorithms with backwards compatible ClientHello
     SKIP: {
         skip "TLSv1.2 disabled", 1 if disabled("tls1_2");
         $testtype = COMPAT_SIGALGS;
@@ -281,28 +303,28 @@ SKIP: {
 SKIP: {
     skip "TLSv1.3 disabled", 5
         if disabled("tls1_3") || (disabled("ec") && disabled("dh"));
-    #Test 22: Insert signature_algorithms_cert that match normal sigalgs
+    #Test 23: Insert signature_algorithms_cert that match normal sigalgs
     $testtype = SIGALGS_CERT_ALL;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->success, "sigalgs_cert in TLSv1.3");
 
-    #Test 23: Insert signature_algorithms_cert that forces PKCS#1 cert
+    #Test 24: Insert signature_algorithms_cert that forces PKCS#1 cert
     $testtype = SIGALGS_CERT_PKCS;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->success, "sigalgs_cert in TLSv1.3 with PKCS#1 cert");
 
-    #Test 24: Insert signature_algorithms_cert that fails
+    #Test 25: Insert signature_algorithms_cert that fails
     $testtype = SIGALGS_CERT_INVALID;
     $proxy->clear();
     $proxy->filter(\&modify_sigalgs_cert_filter);
     $proxy->start();
     ok(TLSProxy::Message->fail, "No matching certificate for sigalgs_cert");
 
-    #Test 25: Send an unrecognized signature_algorithms_cert
+    #Test 26: Send an unrecognized signature_algorithms_cert
     #        We should be able to skip over the unrecognized value and use a
     #        valid one that appears later in the list.
     $proxy->clear();
@@ -318,7 +340,7 @@ SKIP: {
     $proxy->start();
     ok(TLSProxy::Message->success(), "Unrecognized sigalg_cert in ClientHello");
 
-    #Test 26: Send an unrecognized signature_algorithms
+    #Test 27: Send an unrecognized signature_algorithms
     #        We should be able to skip over the unrecognized value and use a
     #        valid one that appears later in the list.
     $proxy->clear();
@@ -333,8 +355,6 @@ SKIP: {
     ok(TLSProxy::Message->success(), "Unrecognized sigalg in ClientHello");
 }
 
-
-
 sub sigalgs_filter
 {
     my $proxy = shift;
@@ -473,7 +493,11 @@ sub modify_cert_verify_sigalg
 
     foreach my $message (@{$proxy->message_list}) {
         if ($message->mt == TLSProxy::Message::MT_CERTIFICATE_VERIFY) {
-            $message->sigalg(TLSProxy::Message::SIG_ALG_RSA_PSS_PSS_SHA256);
+            if ($testtype == RSAPSSPSS_SIG_ALG) {
+                $message->sigalg(TLSProxy::Message::SIG_ALG_RSA_PSS_PSS_SHA256);
+            } elsif ($testtype == MLDSA65_SIG_ALG) {
+                $message->sigalg(TLSProxy::Message::SIG_ALG_MLDSA65);
+            }
             $message->repack();
         }
     }

diff --git a/util/perl/TLSProxy/Message.pm b/util/perl/TLSProxy/Message.pm
index 82db4022c24fde65edb8604e821fe66146e8c4b5..f5ca35df3e8c541df5a8397705ded739767ab58b 100644 (file)
--- a/util/perl/TLSProxy/Message.pm
+++ b/util/perl/TLSProxy/Message.pm
@@ -128,6 +128,7 @@ use constant {
     SIG_ALG_DSA_SHA256 => 0x0402,
     SIG_ALG_DSA_SHA384 => 0x0502,
     SIG_ALG_DSA_SHA512 => 0x0602,
+    SIG_ALG_MLDSA65 => 0x0905,
     OSSL_SIG_ALG_RSA_PKCS1_SHA224 => 0x0301,
     OSSL_SIG_ALG_DSA_SHA224 => 0x0302,
     OSSL_SIG_ALG_ECDSA_SHA224 => 0x0303