From 613bde0aebad5edbe53f9f1e082b55a64159d352 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Fri, 1 Jun 2018 21:24:59 +0200 Subject: [PATCH] crypto: cashaddr for verify message --- firmware/crypto.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/firmware/crypto.c b/firmware/crypto.c index 2830f7b010..e538aeb608 100644 --- a/firmware/crypto.c +++ b/firmware/crypto.c @@ -32,6 +32,7 @@ #include "coins.h" #include "base58.h" #include "segwit_addr.h" +#include "cash_addr.h" uint32_t ser_length(uint32_t len, uint8_t *out) { @@ -177,7 +178,14 @@ int cryptoMessageVerify(const CoinInfo *coin, const uint8_t *message, size_t mes // p2pkh if (signature[0] >= 27 && signature[0] <= 34) { - size_t len = base58_decode_check(address, coin->curve->hasher_base58, addr_raw, MAX_ADDR_RAW_SIZE); + size_t len; + if (coin->cashaddr_prefix) { + if (!cash_addr_decode(addr_raw, &len, coin->cashaddr_prefix, address)) { + return 2; + } + } else { + len = base58_decode_check(address, coin->curve->hasher_base58, addr_raw, MAX_ADDR_RAW_SIZE); + } ecdsa_get_address_raw(pubkey, coin->address_type, coin->curve->hasher_pubkey, recovered_raw); if (memcmp(recovered_raw, addr_raw, len) != 0 || len != address_prefix_bytes_len(coin->address_type) + 20) {