Merge pull request #10820 from minosgalanakis/tools/fix-auto-generated-files

Fix generate_errors.pl
Merge pull request #10804 from valeriosetti/improve-rsa-pubkey-import-err-code
2026-07-31 00:37:08 +08:00 · 2026-07-20 09:55:59 +00:00 · 2026-07-15 11:09:33 +00:00 · 2026-07-09 15:20:32 +01:00 · 2026-07-08 13:16:51 +00:00 · 2026-07-08 10:44:21 +01:00
6 changed files with 24 additions and 20 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit dde0c4a0e448a0552f18817dcea633bb851fd288
+Subproject commit a3079552234917a9831dd70693983af5e62c70de
--- a/library/ssl_tls13_generic.c
+++ b/library/ssl_tls13_generic.c
@ -341,11 +341,12 @@ static int ssl_tls13_parse_certificate_verify(mbedtls_ssl_context *ssl,

    MBEDTLS_SSL_DEBUG_BUF(3, "verify hash", verify_hash, verify_hash_len);

-    if ((ret = mbedtls_pk_verify_ext((mbedtls_pk_sigalg_t) sig_alg,
-                                     &ssl->session_negotiate->peer_cert->pk,
-                                     md_alg, verify_hash, verify_hash_len,
-                                     p, signature_len)) == 0) {
-        return 0;
+    ret = mbedtls_pk_verify_ext((mbedtls_pk_sigalg_t) sig_alg,
+                                &ssl->session_negotiate->peer_cert->pk,
+                                md_alg, verify_hash, verify_hash_len,
+                                p, signature_len);
+    if (ret == 0) {
+        return ret;
    }
    MBEDTLS_SSL_DEBUG_RET(1, "mbedtls_pk_verify_ext", ret);

--- a/scripts/generate_errors.pl
+++ b/scripts/generate_errors.pl
@ -188,7 +188,7 @@ foreach my $match (@matches)
            $first = 0;
            foreach my $dep (split(/,/, ${$old_define_name}))
            {
-                ${$code_check} .= " || \n          " if ($first++);
+                ${$code_check} .= " ||\n          " if ($first++);
                ${$code_check} .= "${$old_define_prefix}${dep}${$old_define_suffix}";
            }
            ${$code_check} .= " */\n\n";
@ -229,7 +229,7 @@ if ($ll_old_define[0] ne "")
    my $first = 0;
    foreach my $dep (split(/,/, $ll_old_define[0]))
    {
-        $ll_code_check .= " || \n          " if ($first++);
+        $ll_code_check .= " ||\n          " if ($first++);
        $ll_code_check .= "${ll_old_define[1]}${dep}${ll_old_define[2]}";
    }
    $ll_code_check .= " */\n";
@ -240,7 +240,7 @@ if ($hl_old_define[0] ne "")
    my $first = 0;
    foreach my $dep (split(/,/, $hl_old_define[0]))
    {
-        $hl_code_check .= " || \n          " if ($first++);
+        $hl_code_check .= " ||\n          " if ($first++);
        $hl_code_check .= "${hl_old_define[1]}${dep}${hl_old_define[2]}";
    }
    $hl_code_check .= " */\n";
--- a/tests/suites/test_suite_x509parse.data
+++ b/tests/suites/test_suite_x509parse.data
@ -1769,15 +1769,15 @@ x509parse_crt:"307d3068a0030201008204deadbeef300d06092a864886f70d01010b0500300c3

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, inv internal bitstring length)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
-x509parse_crt:"308180306ba0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a300806001304546573743015300d06092A864886F70D0101010500030400300000300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_PUBKEY
+x509parse_crt:"308180306ba0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a300806001304546573743015300d06092A864886F70D0101010500030400300000300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_ALG

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, inv internal bitstring tag)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
-x509parse_crt:"308180306ba0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a300806001304546573743015300d06092A864886F70D0101010500030400310000300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_PUBKEY
+x509parse_crt:"308180306ba0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a300806001304546573743015300d06092A864886F70D0101010500030400310000300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_ALG

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, inv RSA modulus)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
-x509parse_crt:"3081873072a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374301c300d06092A864886F70D0101010500030b0030080202ffff0302ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_PUBKEY
+x509parse_crt:"3081873072a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374301c300d06092A864886F70D0101010500030b0030080202ffff0302ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_ALG

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, total length mismatch)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
@ -1785,11 +1785,11 @@ x509parse_crt:"3081893074a0030201008204deadbeef300d06092a864886f70d01010b0500300

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, check failed)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
-x509parse_crt:"3081873072a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374301c300d06092A864886F70D0101010500030b0030080202ffff0202ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_PUBKEY
+x509parse_crt:"3081873072a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374301c300d06092A864886F70D0101010500030b0030080202ffff0202ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_ALG

 X509 CRT ASN1 (TBS, inv SubPubKeyInfo, check failed, expanded length notation)
 depends_on:PSA_HAVE_ALG_SOME_RSA_VERIFY:PSA_WANT_ALG_SHA_256
-x509parse_crt:"308196308180a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374302a300d06092A864886F70D010101050003190030160210fffffffffffffffffffffffffffffffe0202ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_PUBKEY
+x509parse_crt:"308196308180a0030201008204deadbeef300d06092a864886f70d01010b0500300c310a30080600130454657374301c170c303930313031303030303030170c303931323331323335393539300c310a30080600130454657374302a300d06092A864886F70D010101050003190030160210fffffffffffffffffffffffffffffffe0202ffff300d06092a864886f70d01010b0500030200ff":"":MBEDTLS_ERR_PK_INVALID_ALG

 # We expect an extension parsing error here because the IssuerID is optional.
 # Hence, if we find an ASN.1 tag doesn't match the IssuerID, we assume the
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@ -1136,12 +1136,15 @@ void x509parse_crt(data_t *buf, char *result_str, int result)
 #else
    ((void) result_str);
 #endif
-    /* Tests whose result is MBEDTLS_ERR_PK_INVALID_PUBKEY might return
-     * MBEDTLS_ERR_ASN1_UNEXPECTED_TAG until psa#308 is merged. This variable
-     * is therefore used for backward compatiblity and will be removed in
-     * mbedtls#10229. */
-    int result_back_comp = result;
    int res;
+    /* After psa#827 some failing tests that were returning MBEDTLS_ERR_PK_INVALID_PUBKEY
+     * will return MBEDTLS_ERR_PK_INVALID_ALG instead. We need a temporary
+     * backward compatibility fix until psa#827 is merged.
+     */
+    int result_back_comp = result;
+    if (result == MBEDTLS_ERR_PK_INVALID_ALG) {
+        result_back_comp = MBEDTLS_ERR_PK_INVALID_PUBKEY;
+    }

    mbedtls_x509_crt_init(&crt);
    USE_PSA_INIT();
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 73c5da561c8e5253db7b1fb440eda86fde8d8024
+Subproject commit a92cb6a97d84762d2f4355eae99af7b9ff5c6ae1
Author	SHA1	Message	Date
David Horstmann	3bb3738679	Merge pull request #10820 from minosgalanakis/tools/fix-auto-generated-files Fix generate_errors.pl	2026-07-20 09:55:59 +00:00
David Horstmann	12556bc2a2	Merge pull request #10804 from valeriosetti/improve-rsa-pubkey-import-err-code pk: improve error code failure reporting when RSA public key parsing fails (1/2)	2026-07-15 11:09:33 +00:00
Minos Galanakis	32ae7d92d6	Fix generate_errors.pl Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>	2026-07-09 15:20:32 +01:00
Ronald Cron	9e9eb069d6	Merge pull request #10817 from Mbed-TLS/mbedtls-4.2.0_mergeback Mbedtls 4.2.0 mergeback	2026-07-08 13:16:51 +00:00
Minos Galanakis	bacdd16661	Updated framework Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>	2026-07-08 10:44:21 +01:00
Minos Galanakis	53aaf3215b	Updated tf-psa-crypto submodule Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>	2026-07-08 10:43:26 +01:00
Valerio Setti	a5b83aea58	tests: x509parse: add temporary fallback mechanism for PK error codes Add a temporary fallback mechanism in 'x509parse_crt' while crypto#827 is merged. Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>	2026-07-07 22:56:30 +02:00
Minos Galanakis	970ccc59b0	Merge tag 'mbedtls-4.2.0' into mbedtls-4.2.0_mergeback Mbed TLS 4.2.0 Signed-off-by: Minos Galanakis <minos.galanakis@arm.com>	2026-07-07 16:51:57 +01:00
Valerio Setti	8607628249	tests: x509parse: adjust some PK related error codes After crypto#827 some PK error codes changed from MBEDTLS_ERR_PK_INVALID_PUBKEY to MBEDTLS_ERR_PK_INVALID_ALG. This commit adjusts failing test cases. Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>	2026-07-02 14:05:15 +02:00
Valerio Setti	47e9e61020	Merge pull request #10656 from bjwtaylor/unused-variable-ret Fix variable set but not used warning	2026-07-01 08:26:29 +00:00
Ben Taylor	5554a33fb2	Add ret return pattern to avoid variable ret was set but never used warning Signed-off-by: Ben Taylor <ben.taylor@linaro.org>	2026-03-25 15:27:58 +00:00