commit 3914840d784e00f263a574f11dfa9effe9c44f01
author Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 16:02:36 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Tue Jul 08 18:28:30 2014 +0200
tree 090f57e1964e6e5408d8f1821f6d47f077399e5e
parent 993f02cda0272c1f02d2d77dd44ac9c2d30553f4

Cleaned up location of init and free for some programs to prevent memory
leaks on incorrect arguments

programs/pkey/rsa_sign_pss.c

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;