Merge remote-tracking branch 'upstream-restricted/pr/369' into development-restricted

This commit is contained in:
Gilles Peskine 2017-11-28 14:16:47 +01:00
commit c753f5daf4
11 changed files with 82 additions and 34 deletions

View file

@ -542,7 +542,10 @@ static int load_file( const char *path, unsigned char **buf, size_t *n )
if( fread( *buf, 1, *n, f ) != *n )
{
fclose( f );
mbedtls_zeroize( *buf, *n + 1 );
mbedtls_free( *buf );
return( MBEDTLS_ERR_DHM_FILE_IO_ERROR );
}