mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 01:35:27 +00:00
Merge pull request #3720 from militant-daos/mbedtls-2.16
backport 2.16: Fix premature fopen() call in mbedtls_entropy_write_seed_file
This commit is contained in:
commit
cb25374b2c
5
ChangeLog.d/bugfix_PR3616.txt
Normal file
5
ChangeLog.d/bugfix_PR3616.txt
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
Bugfix
|
||||||
|
* Fix premature fopen() call in mbedtls_entropy_write_seed_file which may
|
||||||
|
lead to the seed file corruption in case if the path to the seed file is
|
||||||
|
equal to MBEDTLS_PLATFORM_STD_NV_SEED_FILE. Contributed by Victor
|
||||||
|
Krasnoshchok in #3616.
|
|
@ -494,14 +494,20 @@ int mbedtls_entropy_update_nv_seed( mbedtls_entropy_context *ctx )
|
||||||
int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path )
|
int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *path )
|
||||||
{
|
{
|
||||||
int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
|
int ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
|
||||||
FILE *f;
|
FILE *f = NULL;
|
||||||
unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
|
unsigned char buf[MBEDTLS_ENTROPY_BLOCK_SIZE];
|
||||||
|
|
||||||
if( ( f = fopen( path, "wb" ) ) == NULL )
|
|
||||||
return( MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR );
|
|
||||||
|
|
||||||
if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
|
if( ( ret = mbedtls_entropy_func( ctx, buf, MBEDTLS_ENTROPY_BLOCK_SIZE ) ) != 0 )
|
||||||
|
{
|
||||||
|
ret = MBEDTLS_ERR_ENTROPY_SOURCE_FAILED;
|
||||||
goto exit;
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
|
if( ( f = fopen( path, "wb" ) ) == NULL )
|
||||||
|
{
|
||||||
|
ret = MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR;
|
||||||
|
goto exit;
|
||||||
|
}
|
||||||
|
|
||||||
if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
|
if( fwrite( buf, 1, MBEDTLS_ENTROPY_BLOCK_SIZE, f ) != MBEDTLS_ENTROPY_BLOCK_SIZE )
|
||||||
{
|
{
|
||||||
|
@ -514,7 +520,9 @@ int mbedtls_entropy_write_seed_file( mbedtls_entropy_context *ctx, const char *p
|
||||||
exit:
|
exit:
|
||||||
mbedtls_platform_zeroize( buf, sizeof( buf ) );
|
mbedtls_platform_zeroize( buf, sizeof( buf ) );
|
||||||
|
|
||||||
|
if( f != NULL )
|
||||||
fclose( f );
|
fclose( f );
|
||||||
|
|
||||||
return( ret );
|
return( ret );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,9 @@ entropy_seed_file:"data_files/entropy_seed":0
|
||||||
Entropy write/update seed file
|
Entropy write/update seed file
|
||||||
entropy_seed_file:"no_such_dir/file":MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR
|
entropy_seed_file:"no_such_dir/file":MBEDTLS_ERR_ENTROPY_FILE_IO_ERROR
|
||||||
|
|
||||||
|
Entropy write/update seed file: base NV seed file
|
||||||
|
entropy_write_base_seed_file:0
|
||||||
|
|
||||||
Entropy too many sources
|
Entropy too many sources
|
||||||
entropy_too_many_sources:
|
entropy_too_many_sources:
|
||||||
|
|
||||||
|
|
|
@ -162,6 +162,21 @@ exit:
|
||||||
}
|
}
|
||||||
/* END_CASE */
|
/* END_CASE */
|
||||||
|
|
||||||
|
/* BEGIN_CASE depends_on:MBEDTLS_ENTROPY_NV_SEED:MBEDTLS_FS_IO */
|
||||||
|
void entropy_write_base_seed_file( int ret )
|
||||||
|
{
|
||||||
|
mbedtls_entropy_context ctx;
|
||||||
|
|
||||||
|
mbedtls_entropy_init( &ctx );
|
||||||
|
|
||||||
|
TEST_ASSERT( mbedtls_entropy_write_seed_file( &ctx, MBEDTLS_PLATFORM_STD_NV_SEED_FILE ) == ret );
|
||||||
|
TEST_ASSERT( mbedtls_entropy_update_seed_file( &ctx, MBEDTLS_PLATFORM_STD_NV_SEED_FILE ) == ret );
|
||||||
|
|
||||||
|
exit:
|
||||||
|
mbedtls_entropy_free( &ctx );
|
||||||
|
}
|
||||||
|
/* END_CASE */
|
||||||
|
|
||||||
/* BEGIN_CASE */
|
/* BEGIN_CASE */
|
||||||
void entropy_too_many_sources( )
|
void entropy_too_many_sources( )
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue