mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-27 15:35:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve test for detection of ver/cfg corruption in serialized data

Browse Source 
This commit improves the test exercising the behaviour of
session deserialization when facing an unexpected version
or config, by testing ver/cfg corruption at any bit in the
ver/cfg header of the serialized data; previously, it had
only tested the first bit of each byte.
This commit is contained in:
Hanno Becker 2019-05-29 12:45:21 +01:00 committed by Jarno Lamsa
parent 363b646dd8
commit fe1275e3fe
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
tests/suites/test_suite_ssl.function
View File

@ -930,44 +930,57 @@ void ssl_session_serialize_version_check( int corrupt_major,
{ {
unsigned char serialized_session[ 2048 ]; unsigned char serialized_session[ 2048 ];
size_t serialized_session_len; size_t serialized_session_len;
unsigned cur_byte;
mbedtls_ssl_session session; mbedtls_ssl_session session;
uint8_t should_corrupt_byte[] = { corrupt_major == 1,
corrupt_minor == 1,
corrupt_patch == 1,
corrupt_config == 1,
corrupt_config == 1 };
mbedtls_ssl_session_init( &session ); mbedtls_ssl_session_init( &session );
/* Infer length of serialized session. */ /* Infer length of serialized session. */
TEST_ASSERT( mbedtls_ssl_session_save( &session, TEST_ASSERT( mbedtls_ssl_session_save( &session,
serialized_session, serialized_session,
sizeof( serialized_session ), sizeof( serialized_session ),
&serialized_session_len ) == 0 ); &serialized_session_len ) == 0 );
mbedtls_ssl_session_free( &session ); mbedtls_ssl_session_free( &session );
/* Without any modification, we should be able to successfully /* Without any modification, we should be able to successfully
* de-serialize the session - double-check that. */ * de-serialize the session - double-check that. */
TEST_ASSERT( mbedtls_ssl_session_load( &session, TEST_ASSERT( mbedtls_ssl_session_load( &session,
serialized_session, serialized_session,
serialized_session_len ) == 0 ); serialized_session_len ) == 0 );
mbedtls_ssl_session_free( &session ); mbedtls_ssl_session_free( &session );
if( corrupt_major ) /* Go through the bytes in the serialized session header and
serialized_session[0] ^= (uint8_t) 0x1; * corrupt them bit-by-bit. */
for( cur_byte = 0; cur_byte < sizeof( should_corrupt_byte ); cur_byte++ )
if( corrupt_minor )
serialized_session[1] ^= (uint8_t) 0x1;
if( corrupt_patch )
serialized_session[2] ^= (uint8_t) 0x1;
if( corrupt_config )
{ {
serialized_session[3] ^= (uint8_t) 0x1; int cur_bit;
serialized_session[4] ^= (uint8_t) 0x1; unsigned char * const byte = &serialized_session[ cur_byte ];
serialized_session[5] ^= (uint8_t) 0x1;
if( should_corrupt_byte[ cur_byte ] == 0 )
continue;
for( cur_bit = 0; cur_bit < CHAR_BIT; cur_bit++ )
{
unsigned char const corrupted_bit = 0x1u << cur_bit;
/* Modify a single bit in the serialized session. */
*byte ^= corrupted_bit;
/* Attempt to deserialize */
TEST_ASSERT( mbedtls_ssl_session_load( &session,
serialized_session,
serialized_session_len ) ==
MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
/* Undo the change */
*byte ^= corrupted_bit;
}
} }
TEST_ASSERT( mbedtls_ssl_session_load( &session,
serialized_session,
serialized_session_len ) ==
MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
} }
/* END_CASE */ /* END_CASE */