From e70900d49e4d3b433934e90574f79ea3c1e1b562 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <stick@gk2.sk>
Date: Mon, 10 Oct 2016 10:17:51 +0200
Subject: [PATCH] don't tie message verification with P2PKH addresses

---
 firmware/crypto.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/firmware/crypto.c b/firmware/crypto.c
index 0f8344e..de0e8e9 100644
--- a/firmware/crypto.c
+++ b/firmware/crypto.c
@@ -172,8 +172,12 @@ int cryptoMessageVerify(const CoinType *coin, const uint8_t *message, size_t mes
 		pubkey[0] = 0x02 | (pubkey[64] & 1);
 	}
 	// check if the address is correct
-	ecdsa_get_address_raw(pubkey, coin->address_type, addr_raw);
-	if (memcmp(addr_raw, address_raw, prefixBytesByAddressType(coin->address_type) + 20) != 0) {
+	uint32_t address_type;
+	if (!getAddressType(coin, address_raw, &address_type)) {
+		return 2;
+	}
+	ecdsa_get_address_raw(pubkey, address_type, addr_raw);
+	if (memcmp(addr_raw, address_raw, prefixBytesByAddressType(address_type) + 20) != 0) {
 		return 2;
 	}
 	return 0;