commit 0c226106937df932b6d5960139a2884c1ed2b632
author Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 16:02:36 2014 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Apr 17 16:02:36 2014 +0200
tree aab0b60e963e2fe304c9b8155e66611b89b12495
parent cbe3d0d5cc78d1a6367a628028c108111e9b2320

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

programs/pkey/pk_sign.c

diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c
index 67ac0b4..4adb753 100644
--- a/programs/pkey/pk_sign.c
+++ b/programs/pkey/pk_sign.c
@@ -58,7 +58,7 @@
 int main( int argc, char *argv[] )
 {
     FILE *f;
-    int ret;
+    int ret = 1;
     pk_context pk;
     entropy_context entropy;
     ctr_drbg_context ctr_drbg;
@@ -68,7 +68,8 @@
     const char *pers = "pk_sign";
     size_t olen = 0;
 
-    ret = 1;
+    entropy_init( &entropy );
+    pk_init( &pk );
 
     if( argc != 3 )
     {
@@ -84,7 +85,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 )
@@ -96,8 +96,6 @@
     printf( "\n  . Reading private key from '%s'", argv[1] );
     fflush( stdout );
 
-    pk_init( &pk );
-
     if( ( ret = pk_parse_keyfile( &pk, argv[1], "" ) ) != 0 )
     {
         ret = 1;