commit 0350d562862e0ffe3a3869140693ca6111d4e1e6
author Hanno Becker <hanno.becker@arm.com> Thu Mar 28 14:23:36 2019 +0000
committer Hanno Becker <hanno.becker@arm.com> Thu Mar 28 16:13:44 2019 +0000
tree 149d59f9ce50b8079f83e234bd9e1ef659c7d21a
parent cbb590369c554c294b885c52b8a57774d810a1d9

Only run X.509 CRT verification tests with CA callback tests if !CRL

tests/suites/test_suite_x509parse.function

diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function
index e90ddc4..1d9218a 100644
--- a/tests/suites/test_suite_x509parse.function
+++ b/tests/suites/test_suite_x509parse.function
@@ -440,12 +440,17 @@
     TEST_ASSERT( flags == (uint32_t)( flags_result ) );
 
 #if defined(MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK)
-    flags = 0;
+    /* CRLs aren't supported with CA callbacks, so skip the CA callback
+     * version of the test of CRLs are in use. */
+    if( crl_file == NULL || strcmp( crl_file, "" ) == 0 )
+    {
+        flags = 0;
 
-    res = mbedtls_x509_crt_verify_with_cb( &crt, ca_callback, &ca, profile, cn_name, &flags, f_vrfy, NULL );
+        res = mbedtls_x509_crt_verify_with_cb( &crt, ca_callback, &ca, profile, cn_name, &flags, f_vrfy, NULL );
 
-    TEST_ASSERT( res == ( result ) );
-    TEST_ASSERT( flags == (uint32_t)( flags_result ) );
+        TEST_ASSERT( res == ( result ) );
+        TEST_ASSERT( flags == (uint32_t)( flags_result ) );
+    }
 #endif /* MBEDTLS_X509_TRUSTED_CERTIFICATE_CALLBACK */
 exit:
     mbedtls_x509_crt_free( &crt );