mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2024-12-29 00:17:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix ret code in rsa_encrypt.c

Browse Source
This commit is contained in:
Andres Amaya Garcia 2018-04-30 22:08:36 +01:00
parent 7fe4edf8c0
commit 25b5af58b4
1 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
programs/pkey/rsa_encrypt.c
View File

@ -30,12 +30,12 @@
#else #else
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#define mbedtls_fprintf fprintf #define mbedtls_fprintf fprintf
#define mbedtls_printf printf #define mbedtls_printf printf
#define mbedtls_exit exit #define mbedtls_exit exit
#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS #define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS
#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE #define MBEDTLS_EXIT_FAILURE EXIT_FAILURE
#endif #endif /* MBEDTLS_PLATFORM_C */
#if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_RSA_C) && \ #if defined(MBEDTLS_BIGNUM_C) && defined(MBEDTLS_RSA_C) && \
defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_FS_IO) && \ defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_FS_IO) && \
@ -61,7 +61,8 @@ int main( void )
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
FILE *f; FILE *f;
int return_val, exit_val; int ret = 1;
int exit_code = MBEDTLS_EXIT_FAILURE;
size_t i; size_t i;
mbedtls_rsa_context rsa; mbedtls_rsa_context rsa;
mbedtls_entropy_context entropy; mbedtls_entropy_context entropy;
@ -71,8 +72,6 @@ int main( int argc, char *argv[] )
const char *pers = "rsa_encrypt"; const char *pers = "rsa_encrypt";
mbedtls_mpi N, E; mbedtls_mpi N, E;
exit_val = MBEDTLS_EXIT_SUCCESS;
if( argc != 2 ) if( argc != 2 )
{ {
mbedtls_printf( "usage: rsa_encrypt <string of max 100 characters>\n" ); mbedtls_printf( "usage: rsa_encrypt <string of max 100 characters>\n" );
@ -81,7 +80,7 @@ int main( int argc, char *argv[] )
mbedtls_printf( "\n" ); mbedtls_printf( "\n" );
#endif #endif
mbedtls_exit( MBEDTLS_EXIT_FAILURE ); mbedtls_exit( exit_code );
} }
mbedtls_printf( "\n . Seeding the random number generator..." ); mbedtls_printf( "\n . Seeding the random number generator..." );
@ -92,14 +91,13 @@ int main( int argc, char *argv[] )
mbedtls_ctr_drbg_init( &ctr_drbg ); mbedtls_ctr_drbg_init( &ctr_drbg );
mbedtls_entropy_init( &entropy ); mbedtls_entropy_init( &entropy );
return_val = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func, ret = mbedtls_ctr_drbg_seed( &ctr_drbg, mbedtls_entropy_func,
&entropy, (const unsigned char *) pers, &entropy, (const unsigned char *) pers,
strlen( pers ) ); strlen( pers ) );
if( return_val != 0 ) if( ret != 0 )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned %d\n", mbedtls_printf( " failed\n ! mbedtls_ctr_drbg_seed returned %d\n",
return_val ); ret );
goto exit; goto exit;
} }
@ -108,35 +106,30 @@ int main( int argc, char *argv[] )
if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL ) if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! Could not open rsa_pub.txt\n" \ mbedtls_printf( " failed\n ! Could not open rsa_pub.txt\n" \
" ! Please run rsa_genkey first\n\n" ); " ! Please run rsa_genkey first\n\n" );
goto exit; goto exit;
} }
if( ( return_val = mbedtls_mpi_read_file( &N, 16, f ) ) != 0 || if( ( ret = mbedtls_mpi_read_file( &N, 16, f ) ) != 0 ||
( return_val = mbedtls_mpi_read_file( &E, 16, f ) ) != 0 ) ( ret = mbedtls_mpi_read_file( &E, 16, f ) ) != 0 )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! mbedtls_mpi_read_file returned %d\n\n", mbedtls_printf( " failed\n ! mbedtls_mpi_read_file returned %d\n\n",
return_val ); ret );
fclose( f ); fclose( f );
goto exit; goto exit;
} }
fclose( f ); fclose( f );
if( ( return_val = mbedtls_rsa_import( &rsa, &N, NULL, if( ( ret = mbedtls_rsa_import( &rsa, &N, NULL, NULL, NULL, &E ) ) != 0 )
NULL, NULL, &E ) ) != 0 )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! mbedtls_rsa_import returned %d\n\n", mbedtls_printf( " failed\n ! mbedtls_rsa_import returned %d\n\n",
return_val ); ret );
goto exit; goto exit;
} }
if( strlen( argv[1] ) > 100 ) if( strlen( argv[1] ) > 100 )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " Input data larger than 100 characters.\n\n" ); mbedtls_printf( " Input data larger than 100 characters.\n\n" );
goto exit; goto exit;
} }
@ -149,14 +142,13 @@ int main( int argc, char *argv[] )
mbedtls_printf( "\n . Generating the RSA encrypted value" ); mbedtls_printf( "\n . Generating the RSA encrypted value" );
fflush( stdout ); fflush( stdout );
return_val = mbedtls_rsa_pkcs1_encrypt( &rsa, mbedtls_ctr_drbg_random, ret = mbedtls_rsa_pkcs1_encrypt( &rsa, mbedtls_ctr_drbg_random,
&ctr_drbg, MBEDTLS_RSA_PUBLIC, &ctr_drbg, MBEDTLS_RSA_PUBLIC,
strlen( argv[1] ), input, buf ); strlen( argv[1] ), input, buf );
if( return_val != 0 ) if( ret != 0 )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_encrypt returned %d\n\n", mbedtls_printf( " failed\n ! mbedtls_rsa_pkcs1_encrypt returned %d\n\n",
return_val ); ret );
goto exit; goto exit;
} }
@ -165,7 +157,6 @@ int main( int argc, char *argv[] )
*/ */
if( ( f = fopen( "result-enc.txt", "wb+" ) ) == NULL ) if( ( f = fopen( "result-enc.txt", "wb+" ) ) == NULL )
{ {
exit_val = MBEDTLS_EXIT_FAILURE;
mbedtls_printf( " failed\n ! Could not create %s\n\n", "result-enc.txt" ); mbedtls_printf( " failed\n ! Could not create %s\n\n", "result-enc.txt" );
goto exit; goto exit;
} }
@ -178,6 +169,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( "\n . Done (created \"%s\")\n\n", "result-enc.txt" ); mbedtls_printf( "\n . Done (created \"%s\")\n\n", "result-enc.txt" );
exit_code = MBEDTLS_EXIT_SUCCESS;
exit: exit:
mbedtls_mpi_free( &N ); mbedtls_mpi_free( &E ); mbedtls_mpi_free( &N ); mbedtls_mpi_free( &E );
mbedtls_ctr_drbg_free( &ctr_drbg ); mbedtls_ctr_drbg_free( &ctr_drbg );
@ -189,7 +182,7 @@ exit:
fflush( stdout ); getchar(); fflush( stdout ); getchar();
#endif #endif
return( exit_val ); return( exit_code );
} }
#endif /* MBEDTLS_BIGNUM_C && MBEDTLS_RSA_C && MBEDTLS_ENTROPY_C && #endif /* MBEDTLS_BIGNUM_C && MBEDTLS_RSA_C && MBEDTLS_ENTROPY_C &&
MBEDTLS_FS_IO && MBEDTLS_CTR_DRBG_C */ MBEDTLS_FS_IO && MBEDTLS_CTR_DRBG_C */