From 07a85e732f8781fdc1235970aa52888f45c7e216 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Thu, 30 Jan 2020 08:04:19 +0100 Subject: [PATCH] src/WIF.cpp: Use constants intead of magic number. --- src/WIF.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/WIF.cpp b/src/WIF.cpp index 618de62..5577d8e 100644 --- a/src/WIF.cpp +++ b/src/WIF.cpp @@ -27,16 +27,19 @@ #include "checksum.h" #include "WIF.h" +#define PRIV_KEY_PREFIX 0x80 /* 0x80 for "Bitcoin mainnet". Always used by EOS. */ + std::string wif_priv_encode(ec_privkey_t priv) { checksum_t check; - unsigned char buf[37] = { 0x80 }; + // 1 byte extra for prefix. + unsigned char buf[1 + EC_PRIVKEY_SIZE + CHECKSUM_SIZE] = { PRIV_KEY_PREFIX }; memcpy(buf + 1, priv.data(), priv.size()); // Checksum - check = checksum_sha256d(buf, 33); - memcpy(buf + 33, check.data(), check.size()); + check = checksum_sha256d(buf, 1 + EC_PRIVKEY_SIZE); + memcpy(buf + 1 + EC_PRIVKEY_SIZE, check.data(), check.size()); return base58_encode(buf, buf + sizeof(buf)); } @@ -44,10 +47,10 @@ std::string wif_priv_encode(ec_privkey_t priv) { std::string wif_pub_encode(ec_pubkey_t pub) { checksum_t check = checksum_ripemd160(pub.data(), pub.size()); - unsigned char buf[37]; + unsigned char buf[EC_PUBKEY_SIZE + CHECKSUM_SIZE]; memcpy(buf, pub.data(), pub.size()); - memcpy(buf + 33, check.data(), check.size()); + memcpy(buf + EC_PUBKEY_SIZE, check.data(), check.size()); return "EOS" + base58_encode(buf, buf + sizeof(buf)); }