From 31455f4311a09e82a37c436ad6b18093d0c6a455 Mon Sep 17 00:00:00 2001
From: alhazred <caleb@circlesoft.net>
Date: Mon, 24 Jan 2011 23:19:22 +1300
Subject: [PATCH 1/2] Revert "dump public key as well"

This reverts commit ea876e2dc78862d74fc9c5c7a9e7136944265c30.
---
 bc_key.c | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/bc_key.c b/bc_key.c
index ca84965..f8e1bd5 100644
--- a/bc_key.c
+++ b/bc_key.c
@@ -167,32 +167,20 @@ char *public_key_to_bc_address(char *key, int length){
     
 }
 
-void export_key(const unsigned char *key, int length, int private){
+void export_key(const unsigned char *key, int length){
     EC_KEY* pkey=EC_KEY_new();
-    EVP_PKEY *pubkey=EVP_PKEY_new();
     EC_GROUP *group = EC_GROUP_new_by_curve_name(NID_secp256k1);
     EC_GROUP_set_asn1_flag(group, OPENSSL_EC_NAMED_CURVE);
     EC_GROUP_set_point_conversion_form(group, POINT_CONVERSION_UNCOMPRESSED);
     EC_KEY_set_group(pkey,group);
     BIO *out=BIO_new(BIO_s_file());
     BIO_set_fp(out,stdout,BIO_NOCLOSE);
-
-    if(private){
-        PEM_write_bio_ECPKParameters(out, group);
-        if(!d2i_ECPrivateKey(&pkey, &key, length)){
-            printf("failed to make key\n");
-            exit(1);
-        }
-
-        PEM_write_bio_ECPrivateKey(out,pkey,NULL,NULL,0,NULL,NULL);
-    }
-    else{
-
-        o2i_ECPublicKey(&pkey, &key, length); 
-        EVP_PKEY_assign_EC_KEY(pubkey,pkey);
-        PEM_write_bio_PUBKEY(out, pubkey);
+    if(!d2i_ECPrivateKey(&pkey, &key, length)){
+        printf("failed to make key\n");
+        exit(1);
     }
-
+    PEM_write_bio_ECPKParameters(out, group);
+    PEM_write_bio_ECPrivateKey(out,pkey,NULL,NULL,0,NULL,NULL);
 }
 
 
@@ -221,8 +209,7 @@ void find_key(DBT *key, DBT *value, void *data){
     if(found_key){
         b58=public_key_to_bc_address(public_key,public_key_length);
         if(strcmp(b58,address)==0){
-            export_key(private_key,private_key_length,1);
-            export_key(public_key,public_key_length,0);
+            export_key(private_key,private_key_length);
             exit(0);
         }
         free(public_key);

From db1fd3d857a8d88b2fedf1c1ca975679fc0ce47f Mon Sep 17 00:00:00 2001
From: alhazred <caleb@circlesoft.net>
Date: Mon, 24 Jan 2011 23:19:22 +1300
Subject: [PATCH 2/2] Revert "dump public key as well"

This reverts commit ea876e2dc78862d74fc9c5c7a9e7136944265c30.