commit 27eb0141b9493f89b8dbd71d6a2fecd331a77b7e
author Valerio Setti <valerio.setti@nordicsemi.no> Thu Jun 19 23:40:18 2025 +0200
committer Valerio Setti <valerio.setti@nordicsemi.no> Wed Jun 25 10:25:02 2025 +0200
tree 1739413b2651884a83219296fbc6ffd535c9e265
parent 210b61111bcaa92406a9e59504472a81bdcc2dde

tests: suite_x509parse: rename variable in x509parse_crt()

- rename result_ext to result_back_comp
- add a comment to describe its purpose

Signed-off-by: Valerio Setti <valerio.setti@nordicsemi.no>

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 3220a6e..4f0605c 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -1123,15 +1123,18 @@
 #else
     ((void) result_str);
 #endif
-    /* Pick an error which is not used in the test_suite_x509parse.data file. */
-    int result_ext = MBEDTLS_ERR_ERROR_GENERIC_ERROR;
+    /* 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;
 
 #if !defined(MBEDTLS_PK_USE_PSA_RSA_DATA)
     /* Support for mbedtls#10213 before psa#308. Once psa#308 will be
      * merged this dirty fix can be removed. */
     if (result == MBEDTLS_ERR_PK_INVALID_PUBKEY) {
-        result_ext = MBEDTLS_ERR_ASN1_UNEXPECTED_TAG;
+        result_back_comp = MBEDTLS_ERR_ASN1_UNEXPECTED_TAG;
     }
 #endif /* MBEDTLS_PK_USE_PSA_RSA_DATA */
 
@@ -1139,8 +1142,7 @@
     USE_PSA_INIT();
 
     res = mbedtls_x509_crt_parse_der(&crt, buf->x, buf->len);
-    fprintf(stderr, "\n res=%d, result=%d, result_ext=%d \n", res, result, result_ext);
-    TEST_ASSERT((res == result) || (res == result_ext));
+    TEST_ASSERT((res == result) || (res == result_back_comp));
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     if ((result) == 0) {
         res = mbedtls_x509_crt_info((char *) output, 2000, "", &crt);
@@ -1156,7 +1158,7 @@
     mbedtls_x509_crt_init(&crt);
 
     res = mbedtls_x509_crt_parse_der_nocopy(&crt, buf->x, buf->len);
-    TEST_ASSERT((res == result) || (res == result_ext));
+    TEST_ASSERT((res == result) || (res == result_back_comp));
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     if ((result) == 0) {
         memset(output, 0, 2000);
@@ -1175,7 +1177,7 @@
     mbedtls_x509_crt_init(&crt);
 
     res = mbedtls_x509_crt_parse_der_with_ext_cb(&crt, buf->x, buf->len, 0, NULL, NULL);
-    TEST_ASSERT((res == result) || (res == result_ext));
+    TEST_ASSERT((res == result) || (res == result_back_comp));
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     if ((result) == 0) {
         res = mbedtls_x509_crt_info((char *) output, 2000, "", &crt);
@@ -1192,7 +1194,7 @@
     mbedtls_x509_crt_init(&crt);
 
     res = mbedtls_x509_crt_parse_der_with_ext_cb(&crt, buf->x, buf->len, 1, NULL, NULL);
-    TEST_ASSERT((res == result) || (res == result_ext));
+    TEST_ASSERT((res == result) || (res == result_back_comp));
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     if ((result) == 0) {
         res = mbedtls_x509_crt_info((char *) output, 2000, "", &crt);