Cleaned up location of init and free for some programs to prevent memory
leaks on incorrect arguments
diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c
index 51da9ab..12b2eff 100644
--- a/programs/pkey/dh_client.c
+++ b/programs/pkey/dh_client.c
@@ -275,7 +275,9 @@
exit:
- net_close( server_fd );
+ if( server_fd != -1 )
+ net_close( server_fd );
+
rsa_free( &rsa );
dhm_free( &dhm );
diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c
index b111991..e349140 100644
--- a/programs/pkey/dh_genprime.c
+++ b/programs/pkey/dh_genprime.c
@@ -69,6 +69,7 @@
((void) argv);
mpi_init( &G ); mpi_init( &P ); mpi_init( &Q );
+ entropy_init( &entropy );
if( ( ret = mpi_read_string( &G, 10, GENERATOR ) ) != 0 )
{
@@ -86,7 +87,6 @@
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 )
diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c
index fb9c082..c948233 100644
--- a/programs/pkey/dh_server.c
+++ b/programs/pkey/dh_server.c
@@ -276,7 +276,9 @@
exit:
- net_close( client_fd );
+ if( client_fd != -1 )
+ net_close( client_fd );
+
rsa_free( &rsa );
dhm_free( &dhm );
diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c
index 17e772a..24c083e 100644
--- a/programs/pkey/rsa_sign_pss.c
+++ b/programs/pkey/rsa_sign_pss.c
@@ -62,7 +62,7 @@
int main( int argc, char *argv[] )
{
FILE *f;
- int ret;
+ int ret = 1;
rsa_context rsa;
entropy_context entropy;
ctr_drbg_context ctr_drbg;
@@ -71,7 +71,8 @@
char filename[512];
const char *pers = "rsa_sign_pss";
- ret = 1;
+ entropy_init( &entropy );
+ rsa_init( &rsa, RSA_PKCS_V21, POLARSSL_MD_SHA1 );
if( argc != 3 )
{
@@ -87,7 +88,6 @@
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 )
@@ -99,8 +99,6 @@
printf( "\n . Reading private key from '%s'", argv[1] );
fflush( stdout );
- rsa_init( &rsa, RSA_PKCS_V21, POLARSSL_MD_SHA1 );
-
if( ( ret = x509parse_keyfile( &rsa, argv[1], "" ) ) != 0 )
{
ret = 1;
diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c
index b77fbca..2de6eab 100644
--- a/programs/pkey/rsa_verify_pss.c
+++ b/programs/pkey/rsa_verify_pss.c
@@ -59,14 +59,15 @@
int main( int argc, char *argv[] )
{
FILE *f;
- int ret;
+ int ret = 1;
size_t i;
rsa_context rsa;
unsigned char hash[20];
unsigned char buf[POLARSSL_MPI_MAX_SIZE];
char filename[512];
- ret = 1;
+ rsa_init( &rsa, RSA_PKCS_V21, POLARSSL_MD_SHA1 );
+
if( argc != 3 )
{
printf( "usage: rsa_verify_pss <key_file> <filename>\n" );
@@ -81,8 +82,6 @@
printf( "\n . Reading public key from '%s'", argv[1] );
fflush( stdout );
- rsa_init( &rsa, RSA_PKCS_V21, POLARSSL_MD_SHA1 );
-
if( ( ret = x509parse_public_keyfile( &rsa, argv[1] ) ) != 0 )
{
printf( " failed\n ! x509parse_public_key returned %d\n\n", ret );