Fixes error and exit paths in rsa sample programs
diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c
index 0ea5007..292092c 100644
--- a/programs/pkey/rsa_decrypt.c
+++ b/programs/pkey/rsa_decrypt.c
@@ -31,6 +31,7 @@
#else
#include <stdio.h>
#define polarssl_printf printf
+#define polarssl_exit exit
#endif
#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \
@@ -58,7 +59,7 @@
int main( int argc, char *argv[] )
{
FILE *f;
- int ret, c;
+ int return_val, exit_val, c;
size_t i;
rsa_context rsa;
entropy_context entropy;
@@ -69,9 +70,7 @@
((void) argv);
memset(result, 0, sizeof( result ) );
- entropy_init( &entropy );
- rsa_init( &rsa, RSA_PKCS_V15, 0 );
- ret = 1;
+ exit_val = 0;
if( argc != 1 )
{
@@ -81,17 +80,23 @@
polarssl_printf( "\n" );
#endif
- return ret;
+ polarssl_exit( 1 );
}
polarssl_printf( "\n . Seeding the random number generator..." );
fflush( stdout );
- if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
+ entropy_init( &entropy );
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
+
+ return_val = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
(const unsigned char *) pers,
- strlen( pers ) ) ) != 0 )
+ strlen( pers ) );
+ if( return_val != 0 )
{
- polarssl_printf( " failed\n ! ctr_drbg_init returned %d\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! ctr_drbg_init returned %d\n",
+ return_val );
goto exit;
}
@@ -100,21 +105,24 @@
if( ( f = fopen( "rsa_priv.txt", "rb" ) ) == NULL )
{
+ exit_val = 1;
polarssl_printf( " failed\n ! Could not open rsa_priv.txt\n" \
" ! Please run rsa_genkey first\n\n" );
goto exit;
}
- if( ( ret = mpi_read_file( &rsa.N , 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.E , 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.D , 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.P , 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.Q , 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.DP, 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.DQ, 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.QP, 16, f ) ) != 0 )
+ if( ( return_val = mpi_read_file( &rsa.N , 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.E , 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.D , 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.P , 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.Q , 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.DP, 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.DQ, 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.QP, 16, f ) ) != 0 )
{
- polarssl_printf( " failed\n ! mpi_read_file returned %d\n\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! mpi_read_file returned %d\n\n",
+ return_val );
goto exit;
}
@@ -125,10 +133,9 @@
/*
* Extract the RSA encrypted value from the text file
*/
- ret = 1;
-
if( ( f = fopen( "result-enc.txt", "rb" ) ) == NULL )
{
+ exit_val = 1;
polarssl_printf( "\n ! Could not open %s\n\n", "result-enc.txt" );
goto exit;
}
@@ -143,6 +150,7 @@
if( i != rsa.len )
{
+ exit_val = 1;
polarssl_printf( "\n ! Invalid RSA signature format\n\n" );
goto exit;
}
@@ -153,11 +161,13 @@
polarssl_printf( "\n . Decrypting the encrypted data" );
fflush( stdout );
- if( ( ret = rsa_pkcs1_decrypt( &rsa, ctr_drbg_random, &ctr_drbg,
- RSA_PRIVATE, &i, buf, result,
- 1024 ) ) != 0 )
+ if( ( return_val = rsa_pkcs1_decrypt( &rsa, ctr_drbg_random, &ctr_drbg,
+ RSA_PRIVATE, &i, buf, result,
+ 1024 ) ) != 0 )
{
- polarssl_printf( " failed\n ! rsa_pkcs1_decrypt returned %d\n\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! rsa_pkcs1_decrypt returned %d\n\n",
+ return_val );
goto exit;
}
@@ -165,8 +175,6 @@
polarssl_printf( "The decrypted result is: '%s'\n\n", result );
- ret = 0;
-
exit:
ctr_drbg_free( &ctr_drbg );
entropy_free( &entropy );
@@ -177,6 +185,6 @@
fflush( stdout ); getchar();
#endif
- return( ret );
+ return( exit_val );
}
#endif /* POLARSSL_BIGNUM_C && POLARSSL_RSA_C && POLARSSL_FS_IO */
diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c
index 0e9b9e3..1d35462 100644
--- a/programs/pkey/rsa_encrypt.c
+++ b/programs/pkey/rsa_encrypt.c
@@ -32,6 +32,7 @@
#include <stdio.h>
#define polarssl_fprintf fprintf
#define polarssl_printf printf
+#define polarssl_exit exit
#endif
#if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \
@@ -59,7 +60,7 @@
int main( int argc, char *argv[] )
{
FILE *f;
- int ret;
+ int return_val, exit_val;
size_t i;
rsa_context rsa;
entropy_context entropy;
@@ -68,8 +69,7 @@
unsigned char buf[512];
const char *pers = "rsa_encrypt";
- rsa_init( &rsa, RSA_PKCS_V15, 0 );
- ret = 1;
+ exit_val = 0;
if( argc != 2 )
{
@@ -79,18 +79,24 @@
polarssl_printf( "\n" );
#endif
- goto exit;
+ polarssl_exit( 1 );
}
polarssl_printf( "\n . Seeding the random number generator..." );
fflush( stdout );
entropy_init( &entropy );
- if( ( ret = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
- (const unsigned char *) pers,
- strlen( pers ) ) ) != 0 )
+ rsa_init( &rsa, RSA_PKCS_V15, 0 );
+
+ return_val = ctr_drbg_init( &ctr_drbg, entropy_func, &entropy,
+ (const unsigned char *) pers,
+ strlen( pers ) );
+
+ if( return_val != 0 )
{
- polarssl_printf( " failed\n ! ctr_drbg_init returned %d\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! ctr_drbg_init returned %d\n",
+ return_val );
goto exit;
}
@@ -99,16 +105,18 @@
if( ( f = fopen( "rsa_pub.txt", "rb" ) ) == NULL )
{
- ret = 1;
+ exit_val = 1;
polarssl_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;
}
- if( ( ret = mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
- ( ret = mpi_read_file( &rsa.E, 16, f ) ) != 0 )
+ if( ( return_val = mpi_read_file( &rsa.N, 16, f ) ) != 0 ||
+ ( return_val = mpi_read_file( &rsa.E, 16, f ) ) != 0 )
{
- polarssl_printf( " failed\n ! mpi_read_file returned %d\n\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! mpi_read_file returned %d\n\n",
+ return_val );
goto exit;
}
@@ -118,6 +126,7 @@
if( strlen( argv[1] ) > 100 )
{
+ exit_val = 1;
polarssl_printf( " Input data larger than 100 characters.\n\n" );
goto exit;
}
@@ -130,11 +139,13 @@
polarssl_printf( "\n . Generating the RSA encrypted value" );
fflush( stdout );
- if( ( ret = rsa_pkcs1_encrypt( &rsa, ctr_drbg_random, &ctr_drbg,
- RSA_PUBLIC, strlen( argv[1] ),
- input, buf ) ) != 0 )
+ if( ( return_val = rsa_pkcs1_encrypt( &rsa, ctr_drbg_random, &ctr_drbg,
+ RSA_PUBLIC, strlen( argv[1] ),
+ input, buf ) ) != 0 )
{
- polarssl_printf( " failed\n ! rsa_pkcs1_encrypt returned %d\n\n", ret );
+ exit_val = 1;
+ polarssl_printf( " failed\n ! rsa_pkcs1_encrypt returned %d\n\n",
+ return_val );
goto exit;
}
@@ -143,7 +154,7 @@
*/
if( ( f = fopen( "result-enc.txt", "wb+" ) ) == NULL )
{
- ret = 1;
+ exit_val = 1;
polarssl_printf( " failed\n ! Could not create %s\n\n", "result-enc.txt" );
goto exit;
}
@@ -166,7 +177,7 @@
fflush( stdout ); getchar();
#endif
- return( ret );
+ return( exit_val );
}
#endif /* POLARSSL_BIGNUM_C && POLARSSL_RSA_C && POLARSSL_ENTROPY_C &&
POLARSSL_FS_IO && POLARSSL_CTR_DRBG_C */