Merge pull request #6559 from ihsinme/patch-1

dh_genprime: Fix issue where the error code returned by mbedtls_mpi_write_file() is incorrectly reported on failure
This commit is contained in:
Gilles Peskine 2022-11-15 12:38:41 +01:00 committed by GitHub
commit 32605b24be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions

View File

@ -0,0 +1,4 @@
Bugfix
* Fix bug in error reporting in dh_genprime.c where upon failure,
the error code returned by mbedtls_mpi_write_file() is overwritten
and therefore not printed.

View File

@ -157,8 +157,8 @@ int main( int argc, char **argv )
goto exit; goto exit;
} }
if( ( ret = mbedtls_mpi_write_file( "P = ", &P, 16, fout ) != 0 ) || if( ( ( ret = mbedtls_mpi_write_file( "P = ", &P, 16, fout ) ) != 0 ) ||
( ret = mbedtls_mpi_write_file( "G = ", &G, 16, fout ) != 0 ) ) ( ( ret = mbedtls_mpi_write_file( "G = ", &G, 16, fout ) ) != 0 ) )
{ {
mbedtls_printf( " failed\n ! mbedtls_mpi_write_file returned %d\n\n", ret ); mbedtls_printf( " failed\n ! mbedtls_mpi_write_file returned %d\n\n", ret );
fclose( fout ); fclose( fout );