commit b4e5ddce1b83170c6660a0b18d2951b9de6954f4
author Hanno Becker <hanno.becker@arm.com> Fri Oct 09 09:36:01 2020 +0100
committer Chris Jones <christopher.jones@arm.com> Tue Apr 27 17:20:56 2021 +0100
tree 45c742c4ce2480aca7bb0994a55aea3a03048a9c
parent 88c2bf311a7bde3c0f9001511b48ddb540615607

Fix X.509 CRT parsing test if MBEDTLS_X509_REMOVE_INFO is set

Signed-off-by: Hanno Becker <hanno.becker@arm.com>

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index 82f7da5..54a39ff 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -830,6 +830,8 @@
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
     unsigned char output[2000];
     int res;
+#else
+    ((void) result_str);
 #endif
 
     mbedtls_x509_crt_init( &crt );
@@ -844,15 +846,11 @@
 
         TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
     }
-#else
-    ((void) result_str);
+    memset( output, 0, 2000 );
 #endif
 
     mbedtls_x509_crt_free( &crt );
     mbedtls_x509_crt_init( &crt );
-#if !defined(MBEDTLS_X509_REMOVE_INFO)
-    memset( output, 0, 2000 );
-#endif
 
     TEST_ASSERT( mbedtls_x509_crt_parse_der_nocopy( &crt, buf->x, buf->len ) == ( result ) );
 #if !defined(MBEDTLS_X509_REMOVE_INFO)
@@ -867,15 +865,14 @@
 
         TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
     }
-#else
-    ((void)result_str);
-#endif
+    memset( output, 0, 2000 );
+#endif /* !MBEDTLS_X509_REMOVE_INFO */
 
     mbedtls_x509_crt_free( &crt );
     mbedtls_x509_crt_init( &crt );
-    memset( output, 0, 2000 );
 
     TEST_ASSERT( mbedtls_x509_crt_parse_der_with_ext_cb( &crt, buf->x, buf->len, 0, NULL, NULL ) == ( result ) );
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
     if( ( result ) == 0 )
     {
         res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt );
@@ -885,12 +882,14 @@
 
         TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
     }
+    memset( output, 0, 2000 );
+#endif /* !MBEDTLS_X509_REMOVE_INFO */
 
     mbedtls_x509_crt_free( &crt );
     mbedtls_x509_crt_init( &crt );
-    memset( output, 0, 2000 );
 
     TEST_ASSERT( mbedtls_x509_crt_parse_der_with_ext_cb( &crt, buf->x, buf->len, 1, NULL, NULL ) == ( result ) );
+#if !defined(MBEDTLS_X509_REMOVE_INFO)
     if( ( result ) == 0 )
     {
         res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt );
@@ -900,6 +899,7 @@
 
         TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
     }
+#endif /* !MBEDTLS_X509_REMOVE_INFO */
 
 exit:
     mbedtls_x509_crt_free( &crt );