mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-22 12:55:38 +01:00
pk_sign: fix overriding and ignoring return values
This commit is contained in:
parent
225684015d
commit
0de430678e
@ -24,6 +24,8 @@ Bugfix
|
||||
ECPrivateKey structure. Found by jethrogb, fixed in #1379.
|
||||
* Return plaintext data sooner on unpadded CBC decryption, as stated in
|
||||
the mbedtls_cipher_update() documentation. Contributed by Andy Leiserson.
|
||||
* Fix overriding and ignoring return values when parsing and writing to
|
||||
a file in pk_sign program. Found by kevlut in #1142.
|
||||
|
||||
Changes
|
||||
* Improve testing in configurations that omit certain hashes or
|
||||
|
@ -29,6 +29,7 @@
|
||||
#include "mbedtls/platform.h"
|
||||
#else
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#define mbedtls_snprintf snprintf
|
||||
#define mbedtls_printf printf
|
||||
#endif
|
||||
@ -100,8 +101,7 @@ int main( int argc, char *argv[] )
|
||||
|
||||
if( ( ret = mbedtls_pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
|
||||
{
|
||||
ret = 1;
|
||||
mbedtls_printf( " failed\n ! Could not open '%s'\n", argv[1] );
|
||||
mbedtls_printf( " failed\n ! Could not parse '%s'\n", argv[1] );
|
||||
goto exit;
|
||||
}
|
||||
|
||||
@ -141,6 +141,7 @@ int main( int argc, char *argv[] )
|
||||
|
||||
if( fwrite( buf, 1, olen, f ) != olen )
|
||||
{
|
||||
ret = 1;
|
||||
mbedtls_printf( "failed\n ! fwrite failed\n\n" );
|
||||
goto exit;
|
||||
}
|
||||
@ -167,7 +168,7 @@ exit:
|
||||
fflush( stdout ); getchar();
|
||||
#endif
|
||||
|
||||
return( ret );
|
||||
return( ret ? EXIT_FAILURE : EXIT_SUCCESS );
|
||||
}
|
||||
#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_ENTROPY_C &&
|
||||
MBEDTLS_SHA256_C && MBEDTLS_PK_PARSE_C && MBEDTLS_FS_IO &&
|
||||
|
Loading…
Reference in New Issue
Block a user