From 05bcf662835aefe4b63439860825345afbc911f4 Mon Sep 17 00:00:00 2001 From: Aleksi Lindeman <0xdec05eba@gmail.com> Date: Tue, 13 Mar 2018 08:20:57 +0100 Subject: Fix PrivateKey/PublicKey ::toString --- src/Signature.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/Signature.cpp b/src/Signature.cpp index cba5954..b6fb12a 100644 --- a/src/Signature.cpp +++ b/src/Signature.cpp @@ -1,7 +1,7 @@ #include "../include/odhtdb/Signature.hpp" #include "../include/odhtdb/Hash.hpp" +#include "../include/odhtdb/bin2hex.hpp" #include -#include #include using namespace std; @@ -61,10 +61,7 @@ namespace odhtdb string PublicKey::toString() const { - string result; - result.resize(PUBLIC_KEY_NUM_BYTES * 2 + 1); - sodium_bin2hex(&result[0], PUBLIC_KEY_NUM_BYTES * 2 + 1, (const unsigned char*)data, PUBLIC_KEY_NUM_BYTES); - return result; + return bin2hex(data, PUBLIC_KEY_NUM_BYTES); } PrivateKey::PrivateKey(const char *_data, size_t size) @@ -108,10 +105,7 @@ namespace odhtdb string PrivateKey::toString() const { - string result; - result.resize(PRIVATE_KEY_NUM_BYTES * 2); - sodium_bin2hex(&result[0], PRIVATE_KEY_NUM_BYTES * 2 + 1, (const unsigned char*)data, PRIVATE_KEY_NUM_BYTES); - return result; + return bin2hex(data, PRIVATE_KEY_NUM_BYTES); } KeyPair::KeyPair() -- cgit v1.2.3