yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 23:15:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Possible resource leak on FILE* removed in CTR_DRBG

Browse Source
This commit is contained in:
Paul Bakker 2013-05-14 13:22:41 +02:00
parent 45bda90caa
commit c72d3f7d85
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/ctr_drbg.c
View File

@ -348,7 +348,7 @@ int ctr_drbg_random( void *p_rng, unsigned char *output, size_t output_len )
#if defined(POLARSSL_FS_IO) #if defined(POLARSSL_FS_IO)
int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path ) int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path )
{ {
int ret; int ret = POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR;
FILE *f; FILE *f;
unsigned char buf[ CTR_DRBG_MAX_INPUT ]; unsigned char buf[ CTR_DRBG_MAX_INPUT ];
@ -356,16 +356,19 @@ int ctr_drbg_write_seed_file( ctr_drbg_context *ctx, const char *path )
return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR ); return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR );
if( ( ret = ctr_drbg_random( ctx, buf, CTR_DRBG_MAX_INPUT ) ) != 0 ) if( ( ret = ctr_drbg_random( ctx, buf, CTR_DRBG_MAX_INPUT ) ) != 0 )
return( ret ); goto exit;
if( fwrite( buf, 1, CTR_DRBG_MAX_INPUT, f ) != CTR_DRBG_MAX_INPUT ) if( fwrite( buf, 1, CTR_DRBG_MAX_INPUT, f ) != CTR_DRBG_MAX_INPUT )
{ {
fclose( f ); ret = POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR;
return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR ); goto exit;
} }
ret = 0;
exit:
fclose( f ); fclose( f );
return( 0 ); return( ret );
} }
int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path ) int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
@ -382,7 +385,10 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
fseek( f, 0, SEEK_SET ); fseek( f, 0, SEEK_SET );
if( n > CTR_DRBG_MAX_INPUT ) if( n > CTR_DRBG_MAX_INPUT )
{
fclose( f );
return( POLARSSL_ERR_CTR_DRBG_INPUT_TOO_BIG ); return( POLARSSL_ERR_CTR_DRBG_INPUT_TOO_BIG );
}
if( fread( buf, 1, n, f ) != n ) if( fread( buf, 1, n, f ) != n )
{ {
@ -390,10 +396,10 @@ int ctr_drbg_update_seed_file( ctr_drbg_context *ctx, const char *path )
return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR ); return( POLARSSL_ERR_CTR_DRBG_FILE_IO_ERROR );
} }
ctr_drbg_update( ctx, buf, n );
fclose( f ); fclose( f );
ctr_drbg_update( ctx, buf, n );
return( ctr_drbg_write_seed_file( ctx, path ) ); return( ctr_drbg_write_seed_file( ctx, path ) );
} }
#endif /* POLARSSL_FS_IO */ #endif /* POLARSSL_FS_IO */