From 7457580790a47aadc6bbe47cd50e0904372f6ee8 Mon Sep 17 00:00:00 2001 From: Ben Taylor Date: Wed, 10 Jun 2026 10:17:48 +0100 Subject: [PATCH] Remove pkcs7_parse_free_resets_context as it duplicates pkcs7_parse_reuse Signed-off-by: Ben Taylor (cherry picked from commit 10afc1ed5c8e9c47caf1ad8ee6241fd99e43f945) Backport note: resolved the redundant-test removal conflict by deleting the temporary reset test while keeping the 3.6 pkcs7_verify dependency expression. --- tests/suites/test_suite_pkcs7.data | 4 ---- tests/suites/test_suite_pkcs7.function | 31 -------------------------- 2 files changed, 35 deletions(-) diff --git a/tests/suites/test_suite_pkcs7.data b/tests/suites/test_suite_pkcs7.data index e57245402d..f76f307db5 100644 --- a/tests/suites/test_suite_pkcs7.data +++ b/tests/suites/test_suite_pkcs7.data @@ -22,10 +22,6 @@ PKCS7 Signed Data Parse reused object from multiple signers to one signer depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C pkcs7_parse_reuse:"../framework/data_files/pkcs7_data_multiple_signed.der":"../framework/data_files/pkcs7_data_cert_signed_sha256.der":MBEDTLS_PKCS7_SIGNED_DATA -PKCS7 Signed Data Parse free resets context after multiple signers -depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C -pkcs7_parse_free_resets_context:"../framework/data_files/pkcs7_data_multiple_signed.der":MBEDTLS_PKCS7_SIGNED_DATA - PKCS7 Signed Data Parse Fail with multiple certs #4 depends_on:MBEDTLS_MD_CAN_SHA256:MBEDTLS_RSA_C pkcs7_parse:"../framework/data_files/pkcs7_data_multiple_certs_signed.der":MBEDTLS_ERR_PKCS7_FEATURE_UNAVAILABLE diff --git a/tests/suites/test_suite_pkcs7.function b/tests/suites/test_suite_pkcs7.function index 1f4862fad6..2b4c3284ec 100644 --- a/tests/suites/test_suite_pkcs7.function +++ b/tests/suites/test_suite_pkcs7.function @@ -99,37 +99,6 @@ exit: } /* END_CASE */ -/* BEGIN_CASE depends_on:MBEDTLS_FS_IO */ -void pkcs7_parse_free_resets_context(char *pkcs7_file, int res_expect) -{ - unsigned char *pkcs7_buf = NULL; - mbedtls_pkcs7 pkcs7; - size_t buflen; - - mbedtls_pkcs7_init(&pkcs7); - - /* PKCS7 uses X509 which itself relies on PK under the hood and the latter - * can use PSA to store keys and perform operations so psa_crypto_init() - * must be called before. */ - USE_PSA_INIT(); - - TEST_EQUAL(mbedtls_pk_load_file(pkcs7_file, &pkcs7_buf, &buflen), 0); - - TEST_EQUAL(mbedtls_pkcs7_parse_der(&pkcs7, pkcs7_buf, buflen), - res_expect); - - mbedtls_pkcs7_free(&pkcs7); - - TEST_ASSERT(pkcs7.raw.p == NULL); - TEST_ASSERT(pkcs7.signed_data.signers.next == NULL); - -exit: - mbedtls_pkcs7_free(&pkcs7); - mbedtls_free(pkcs7_buf); - USE_PSA_DONE(); -} -/* END_CASE */ - /* BEGIN_CASE depends_on:MBEDTLS_FS_IO:MBEDTLS_X509_CRT_PARSE_C:MBEDTLS_PKCS1_V15:MBEDTLS_RSA_C */ void pkcs7_verify(char *pkcs7_file, char *crt_files,