commit 2e24ca74b024aa56e085045a757444d380ee4e05
author Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 15:21:27 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Sep 18 15:25:16 2013 +0200
tree e16bff2904e0043f49c8dea78a5c4f413537f3e7
parent cc34f95b4308c78ffcb033192861fa698a9117f7

Updated key_app.c and key_app_writer.c for EC key printing

programs/pkey/key_app_writer.c

diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c
index 3257635..672ebf1 100644
--- a/programs/pkey/key_app_writer.c
+++ b/programs/pkey/key_app_writer.c
@@ -33,6 +33,7 @@
 
 #include "polarssl/config.h"
 
+#include "polarssl/error.h"
 #include "polarssl/pk.h"
 #include "polarssl/error.h"
 
@@ -254,7 +255,8 @@
 
         if( ret != 0 )
         {
-            printf( " failed\n  !  pk_parse_key returned %d", ret );
+            polarssl_strerror( ret, (char *) buf, sizeof(buf) );
+            printf( " failed\n  !  pk_parse_keyfile returned -0x%04x - %s\n\n", -ret, buf );
             goto exit;
         }
 
@@ -280,6 +282,17 @@
         }
         else
 #endif
+#if defined(POLARSSL_ECP_C)
+        if( pk_get_type( &key ) == POLARSSL_PK_ECKEY )
+        {
+            ecp_keypair *ecp = pk_ec( key );
+            mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL );
+            mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL );
+            mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL );
+            mpi_write_file( "D   : ", &ecp->d  , 16, NULL );
+        }
+        else
+#endif
             printf("key type not supported yet\n");
 
     }
@@ -295,7 +308,8 @@
 
         if( ret != 0 )
         {
-            printf( " failed\n  !  pk_parse_public_key returned %d", ret );
+            polarssl_strerror( ret, (char *) buf, sizeof(buf) );
+            printf( " failed\n  !  pk_parse_public_key returned -0x%04x - %s\n\n", -ret, buf );
             goto exit;
         }
 
@@ -315,6 +329,16 @@
         }
         else
 #endif
+#if defined(POLARSSL_ECP_C)
+        if( pk_get_type( &key ) == POLARSSL_PK_ECKEY )
+        {
+            ecp_keypair *ecp = pk_ec( key );
+            mpi_write_file( "Q(X): ", &ecp->Q.X, 16, NULL );
+            mpi_write_file( "Q(Y): ", &ecp->Q.Y, 16, NULL );
+            mpi_write_file( "Q(Z): ", &ecp->Q.Z, 16, NULL );
+        }
+        else
+#endif
             printf("key type not supported yet\n");
     }
     else