yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 18:04:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for buffer corruption after PEM write

Browse Source 
Zero remaining bytes in buffer after writing PEM data and add checks to
ensure that this is the case.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2020-12-03 19:34:30 +00:00
parent 6f714e54f6
commit 102bac7a46
3 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
library/pem.c
View File

@ -510,6 +510,9 @@ int mbedtls_pem_write_buffer( const char *header, const char *footer,
*p++ = '\0'; *p++ = '\0';
*olen = p - buf; *olen = p - buf;
/* Clean any remaining data previously written to the buffer */
memset( buf + *olen, 0, buf_len - *olen );
mbedtls_free( encode_buf ); mbedtls_free( encode_buf );
return( 0 ); return( 0 );
} }

24
tests/suites/test_suite_pkwrite.function
View File

@ -17,7 +17,7 @@ void pk_write_pubkey_check( char *key_file )
unsigned char check_buf[5000]; unsigned char check_buf[5000];
int ret; int ret;
FILE *f; FILE *f;
size_t ilen; size_t ilen, pem_len, buf_index;
memset( buf, 0, sizeof( buf ) ); memset( buf, 0, sizeof( buf ) );
memset( check_buf, 0, sizeof( check_buf ) ); memset( check_buf, 0, sizeof( check_buf ) );
@ -28,12 +28,20 @@ void pk_write_pubkey_check( char *key_file )
ret = mbedtls_pk_write_pubkey_pem( &key, buf, sizeof( buf )); ret = mbedtls_pk_write_pubkey_pem( &key, buf, sizeof( buf ));
TEST_ASSERT( ret == 0 ); TEST_ASSERT( ret == 0 );
pem_len = strlen( (char *) buf );
// check that the rest of the buffer remains clear
for( buf_index = pem_len; buf_index < sizeof( buf ); ++buf_index )
{
TEST_ASSERT( buf[buf_index] == 0 );
}
f = fopen( key_file, "r" ); f = fopen( key_file, "r" );
TEST_ASSERT( f != NULL ); TEST_ASSERT( f != NULL );
ilen = fread( check_buf, 1, sizeof( check_buf ), f ); ilen = fread( check_buf, 1, sizeof( check_buf ), f );
fclose( f ); fclose( f );
TEST_ASSERT( ilen == strlen( (char *) buf ) ); TEST_ASSERT( ilen == pem_len );
TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 ); TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 );
exit: exit:
@ -49,7 +57,7 @@ void pk_write_key_check( char *key_file )
unsigned char check_buf[5000]; unsigned char check_buf[5000];
int ret; int ret;
FILE *f; FILE *f;
size_t ilen; size_t ilen, pem_len, buf_index;
memset( buf, 0, sizeof( buf ) ); memset( buf, 0, sizeof( buf ) );
memset( check_buf, 0, sizeof( check_buf ) ); memset( check_buf, 0, sizeof( check_buf ) );
@ -60,12 +68,20 @@ void pk_write_key_check( char *key_file )
ret = mbedtls_pk_write_key_pem( &key, buf, sizeof( buf )); ret = mbedtls_pk_write_key_pem( &key, buf, sizeof( buf ));
TEST_ASSERT( ret == 0 ); TEST_ASSERT( ret == 0 );
pem_len = strlen( (char *) buf );
// check that the rest of the buffer remains clear
for( buf_index = pem_len; buf_index < sizeof( buf ); ++buf_index )
{
TEST_ASSERT( buf[buf_index] == 0 );
}
f = fopen( key_file, "r" ); f = fopen( key_file, "r" );
TEST_ASSERT( f != NULL ); TEST_ASSERT( f != NULL );
ilen = fread( check_buf, 1, sizeof( check_buf ), f ); ilen = fread( check_buf, 1, sizeof( check_buf ), f );
fclose( f ); fclose( f );
TEST_ASSERT( ilen == strlen( (char *) buf ) ); TEST_ASSERT( ilen == pem_len );
TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 ); TEST_ASSERT( memcmp( (char *) buf, (char *) check_buf, ilen ) == 0 );
exit: exit:

14
tests/suites/test_suite_x509write.function
View File

@ -44,7 +44,7 @@ void x509_csr_check( char * key_file, char * cert_req_check_file, int md_type,
unsigned char buf[4096]; unsigned char buf[4096];
unsigned char check_buf[4000]; unsigned char check_buf[4000];
int ret; int ret;
size_t olen = 0, pem_len = 0; size_t olen = 0, pem_len = 0, buf_index;
int der_len = -1; int der_len = -1;
FILE *f; FILE *f;
const char *subject_name = "C=NL,O=PolarSSL,CN=PolarSSL Server 1"; const char *subject_name = "C=NL,O=PolarSSL,CN=PolarSSL Server 1";
@ -70,6 +70,11 @@ void x509_csr_check( char * key_file, char * cert_req_check_file, int md_type,
pem_len = strlen( (char *) buf ); pem_len = strlen( (char *) buf );
for( buf_index = pem_len; buf_index < sizeof( buf ); ++buf_index )
{
TEST_ASSERT( buf[buf_index] == 0 );
}
f = fopen( cert_req_check_file, "r" ); f = fopen( cert_req_check_file, "r" );
TEST_ASSERT( f != NULL ); TEST_ASSERT( f != NULL );
olen = fread( check_buf, 1, sizeof( check_buf ), f ); olen = fread( check_buf, 1, sizeof( check_buf ), f );
@ -112,7 +117,7 @@ void x509_crt_check( char *subject_key_file, char *subject_pwd,
unsigned char check_buf[5000]; unsigned char check_buf[5000];
mbedtls_mpi serial; mbedtls_mpi serial;
int ret; int ret;
size_t olen = 0, pem_len = 0; size_t olen = 0, pem_len = 0, buf_index;
int der_len = -1; int der_len = -1;
FILE *f; FILE *f;
rnd_pseudo_info rnd_info; rnd_pseudo_info rnd_info;
@ -181,6 +186,11 @@ void x509_crt_check( char *subject_key_file, char *subject_pwd,
pem_len = strlen( (char *) buf ); pem_len = strlen( (char *) buf );
for( buf_index = pem_len; buf_index < sizeof( buf ); ++buf_index )
{
TEST_ASSERT( buf[buf_index] == 0 );
}
f = fopen( cert_check_file, "r" ); f = fopen( cert_check_file, "r" );
TEST_ASSERT( f != NULL ); TEST_ASSERT( f != NULL );
olen = fread( check_buf, 1, sizeof( check_buf ), f ); olen = fread( check_buf, 1, sizeof( check_buf ), f );