yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-02 10:31:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix populate_session() and its usage in tests

Browse source 
Not checking the return value allowed a bug to go undetected, fix the bug and
check the return value.
This commit is contained in:
Manuel Pégourié-Gonnard 2019-05-24 09:40:17 +02:00 committed by Jarno Lamsa
parent a3d831b9e6
commit 6b840704c4
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/suites/test_suite_ssl.function
View file

@ -288,6 +288,11 @@ static int ssl_populate_session( mbedtls_ssl_session *session,
if( strlen( crt_file ) != 0 ) if( strlen( crt_file ) != 0 )
{ {
int ret; int ret;
session->peer_cert = mbedtls_calloc( 1, sizeof( *session->peer_cert ) );
if( session->peer_cert == NULL )
return( -1 );
ret = mbedtls_x509_crt_parse_file( session->peer_cert, crt_file ); ret = mbedtls_x509_crt_parse_file( session->peer_cert, crt_file );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
@ -677,7 +682,7 @@ void ssl_serialise_session_load_save( int ticket_len, char *crt_file )
mbedtls_ssl_session_init( &session ); mbedtls_ssl_session_init( &session );
/* Prepare a dummy session to work on */ /* Prepare a dummy session to work on */
ssl_populate_session( &session, ticket_len, crt_file ); TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
/* Get desired buffer size for serialising */ /* Get desired buffer size for serialising */
TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &len0 ) TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &len0 )
@ -727,7 +732,7 @@ void ssl_serialise_session_save_buf_size( int ticket_len, char *crt_file )
mbedtls_ssl_session_init( &session ); mbedtls_ssl_session_init( &session );
/* Prepare dummy session and get serialised size */ /* Prepare dummy session and get serialised size */
ssl_populate_session( &session, ticket_len, crt_file ); TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len ) TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len )
== MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL ); == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
@ -763,7 +768,7 @@ void ssl_serialise_session_load_buf_size( int ticket_len, char *crt_file )
mbedtls_ssl_session_init( &session ); mbedtls_ssl_session_init( &session );
/* Prepare serialised session data */ /* Prepare serialised session data */
ssl_populate_session( &session, ticket_len, crt_file ); TEST_ASSERT( ssl_populate_session( &session, ticket_len, crt_file ) == 0 );
TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len ) TEST_ASSERT( mbedtls_ssl_session_save( &session, NULL, 0, &good_len )
== MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL ); == MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
TEST_ASSERT( ( good_buf = mbedtls_calloc( 1, good_len ) ) != NULL ); TEST_ASSERT( ( good_buf = mbedtls_calloc( 1, good_len ) ) != NULL );