Merge #31: Add function to export a pubkey as hex representation

jonasschnelli · jonasschnelli · commit a56ea7304004 · 2016-01-22T16:55:39.000+01:00
f46fc21 Add function to export a pubkey as hex representation (Jonas Schnelli)
diff --git a/include/btc/bip32.h b/include/btc/bip32.h
@@ -59,6 +59,7 @@ LIBBTC_API void btc_hdnode_fill_public_key(btc_hdnode* node);
 LIBBTC_API void btc_hdnode_serialize_public(const btc_hdnode* node, const btc_chain* chain, char* str, int strsize);
 LIBBTC_API void btc_hdnode_serialize_private(const btc_hdnode* node, const btc_chain* chain, char* str, int strsize);
 LIBBTC_API void btc_hdnode_get_p2pkh_address(const btc_hdnode* node, const btc_chain* chain, char* str, int strsize);
+LIBBTC_API btc_bool btc_hdnode_get_pub_hex(const btc_hdnode* node, char* str, size_t *strsize);
 LIBBTC_API btc_bool btc_hdnode_deserialize(const char* str, const btc_chain* chain, btc_hdnode* node);
 
 //!derive btc_hdnode including private key from master private key
diff --git a/include/btc/ecc_key.h b/include/btc/ecc_key.h
@@ -59,6 +59,9 @@ LIBBTC_API void btc_pubkey_from_key(btc_key* privkey, btc_pubkey* pubkey_inout);
 //get the hash160 (single SHA256 + RIPEMD160)
 LIBBTC_API void btc_pubkey_get_hash160(const btc_pubkey* pubkey, uint8_t* hash160);
 
+//get the hex representation of a pubkey, strsize must be at leat 66 bytes
+LIBBTC_API btc_bool btc_pubkey_get_hex(const btc_pubkey* pubkey, char* str, size_t *strsize);
+
 //sign a 32byte message/hash and returns a DER encoded signature (through *sigout)
 LIBBTC_API btc_bool btc_key_sign_hash(const btc_key* privkey, const uint8_t* hash, unsigned char* sigout, size_t* outlen);
 
diff --git a/src/bip32.c b/src/bip32.c
@@ -34,6 +34,7 @@
 #include "btc/base58.h"
 #include "btc/hash.h"
 #include "btc/ecc.h"
+#include "btc/ecc_key.h"
 
 #include "ripemd160.h"
 #include "sha2.h"
@@ -223,6 +224,16 @@ void btc_hdnode_get_p2pkh_address(const btc_hdnode* node, const btc_chain* chain
     btc_base58_encode_check(hash160, 21, str, strsize);
 }
 
+btc_bool btc_hdnode_get_pub_hex(const btc_hdnode* node, char* str, size_t *strsize)
+{
+    btc_pubkey pubkey;
+    btc_pubkey_init(&pubkey);
+    memcpy(&pubkey.pubkey, node->public_key, BTC_ECKEY_COMPRESSED_LENGTH);
+    pubkey.compressed = true;
+
+    return btc_pubkey_get_hex(&pubkey, str, strsize);
+}
+
 
 // check for validity of curve point in case of public data not performed
 btc_bool btc_hdnode_deserialize(const char* str, const btc_chain* chain, btc_hdnode* node)
diff --git a/src/ecc_key.c b/src/ecc_key.c
@@ -118,6 +118,16 @@ void btc_pubkey_get_hash160(const btc_pubkey* pubkey, uint8_t* hash160)
 }
 
 
+btc_bool btc_pubkey_get_hex(const btc_pubkey* pubkey, char* str, size_t *strsize)
+{
+    if (*strsize < BTC_ECKEY_COMPRESSED_LENGTH*2)
+        return false;
+    utils_bin_to_hex((unsigned char *)pubkey->pubkey, BTC_ECKEY_COMPRESSED_LENGTH, str);
+    *strsize = BTC_ECKEY_COMPRESSED_LENGTH*2;
+    return true;
+}
+
+
 void btc_pubkey_from_key(btc_key* privkey, btc_pubkey* pubkey_inout)
 {
     if (pubkey_inout == NULL || privkey == NULL)
@@ -135,6 +145,7 @@ btc_bool btc_key_sign_hash(const btc_key* privkey, const uint8_t* hash, unsigned
     return ecc_sign(privkey->privkey, hash, sigout, outlen);
 }
 
+
 btc_bool btc_key_sign_hash_compact(const btc_key* privkey, const uint8_t* hash, unsigned char* sigout, size_t* outlen)
 {
     return ecc_sign_compact(privkey->privkey, hash, sigout, outlen);
diff --git a/test/bip32_tests.c b/test/bip32_tests.c
@@ -226,6 +226,14 @@ void test_bip32()
     u_assert_int_eq(r, true);
     btc_hdnode_get_p2pkh_address(&node4, &btc_chain_test, str, sizeof(str));
     u_assert_str_eq(str, "mp4VkLBrnetj5LkhyNqtgkBzJwRBqhTbaa");
+    size_t size = sizeof(str);
+    size_t sizeSmall = 55;
+    r = btc_hdnode_get_pub_hex(&node4, str, &sizeSmall);
+    u_assert_int_eq(r, false);
+    r = btc_hdnode_get_pub_hex(&node4, str, &size);
+    u_assert_int_eq(size, 66);
+    u_assert_int_eq(r, true);
+    u_assert_str_eq(str, "0391a9964e79f39cebf9b59eb2151b500bd462e589682d6ceebe8e15970bfebf8b");
     btc_hdnode_serialize_public(&node4, &btc_chain_test, str, sizeof(str));
     u_assert_str_eq(str, "tpubD8MQJFN9LVzG8pktwoQ7ApWWKLfUUhonQkeXe8gqi9tFMtMdC34g6Ntj5K6V1hdzR3to2z7dGnQbXaoZSsFkVky7TFWZjmC9Ez4Gog6ujaD");
 }
diff --git a/test/eckey_tests.c b/test/eckey_tests.c
@@ -32,6 +32,7 @@
 
 #include <btc/ecc_key.h>
 
+#include "utest.h"
 #include "utils.h"
 
 void test_eckey()
@@ -65,6 +66,16 @@ void test_eckey()
 
     btc_pubkey_verify_sig(&pubkey, hash, sig, outlen);
 
+
+    size_t size = 66;
+    char str[size];
+    int r = btc_pubkey_get_hex(&pubkey, str, &size);
+    u_assert_int_eq(r, true);
+    u_assert_int_eq(size, 66);
+
+    size = 50;
+    r = btc_pubkey_get_hex(&pubkey, str, &size);
+    u_assert_int_eq(r, false);
     btc_privkey_cleanse(&key);
     btc_pubkey_cleanse(&pubkey);
 }

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,16 @@ void btc_pubkey_get_hash160(const btc_pubkey* pubkey, uint8_t* hash160)`
`118`	`118`	`}`
`119`	`119`
`120`	`120`
	`121`	`+btc_bool btc_pubkey_get_hex(const btc_pubkey* pubkey, char* str, size_t *strsize)`
	`122`	`+{`
	`123`	`+ if (strsize < BTC_ECKEY_COMPRESSED_LENGTH2)`
	`124`	`+ return false;`
	`125`	`+ utils_bin_to_hex((unsigned char *)pubkey->pubkey, BTC_ECKEY_COMPRESSED_LENGTH, str);`
	`126`	`+ strsize = BTC_ECKEY_COMPRESSED_LENGTH2;`
	`127`	`+ return true;`
	`128`	`+}`
	`129`	`+`
	`130`	`+`
`121`	`131`	`void btc_pubkey_from_key(btc_key* privkey, btc_pubkey* pubkey_inout)`
`122`	`132`	`{`
`123`	`133`	`if (pubkey_inout == NULL \|\| privkey == NULL)`
`@@ -135,6 +145,7 @@ btc_bool btc_key_sign_hash(const btc_key* privkey, const uint8_t* hash, unsigned`
`135`	`145`	`return ecc_sign(privkey->privkey, hash, sigout, outlen);`
`136`	`146`	`}`
`137`	`147`
	`148`	`+`
`138`	`149`	`btc_bool btc_key_sign_hash_compact(const btc_key* privkey, const uint8_t* hash, unsigned char* sigout, size_t* outlen)`
`139`	`150`	`{`
`140`	`151`	`return ecc_sign_compact(privkey->privkey, hash, sigout, outlen);`