AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix X.509 CRT parsing test if MBEDTLS_X509_REMOVE_INFO is set

Browse Source 
Signed-off-by: Hanno Becker <hanno.becker@arm.com>
This commit is contained in:
Hanno Becker 2020-10-09 09:36:01 +01:00 committed by Chris Jones
parent 88c2bf311a
commit b4e5ddce1b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tests/suites/test_suite_x509parse.function
View File

@ -830,6 +830,8 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
unsigned char output[2000]; unsigned char output[2000];
int res; int res;
#else
((void) result_str);
#endif #endif
mbedtls_x509_crt_init( &crt ); mbedtls_x509_crt_init( &crt );
@ -844,15 +846,11 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 ); TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
} }
#else memset( output, 0, 2000 );
((void) result_str);
#endif #endif
mbedtls_x509_crt_free( &crt ); mbedtls_x509_crt_free( &crt );
mbedtls_x509_crt_init( &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 ) ); TEST_ASSERT( mbedtls_x509_crt_parse_der_nocopy( &crt, buf->x, buf->len ) == ( result ) );
#if !defined(MBEDTLS_X509_REMOVE_INFO) #if !defined(MBEDTLS_X509_REMOVE_INFO)
@ -867,15 +865,14 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 ); TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
} }
#else memset( output, 0, 2000 );
((void)result_str); #endif /* !MBEDTLS_X509_REMOVE_INFO */
#endif
mbedtls_x509_crt_free( &crt ); mbedtls_x509_crt_free( &crt );
mbedtls_x509_crt_init( &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 ) ); 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 ) if( ( result ) == 0 )
{ {
res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt ); res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt );
@ -885,12 +882,14 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 ); 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_free( &crt );
mbedtls_x509_crt_init( &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 ) ); 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 ) if( ( result ) == 0 )
{ {
res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt ); res = mbedtls_x509_crt_info( (char *) output, 2000, "", &crt );
@ -900,6 +899,7 @@ void x509parse_crt( data_t * buf, char * result_str, int result )
TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 ); TEST_ASSERT( strcmp( (char *) output, result_str ) == 0 );
} }
#endif /* !MBEDTLS_X509_REMOVE_INFO */
exit: exit:
mbedtls_x509_crt_free( &crt ); mbedtls_x509_crt_free( &crt );