arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

fix Verify (by introducing coinExtractAddressType)

Browse Source
This commit is contained in:
Pavol Rusnak 2016-10-25 17:02:02 +02:00
parent 0b51d060d8
commit f8ad9fc742
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/coins.c
View File

@ -20,6 +20,8 @@
#include <string.h> #include <string.h>
#include "coins.h" #include "coins.h"
#include "address.h" #include "address.h"
#include "ecdsa.h"
#include "base58.h"
// filled CoinType Protobuf structure defined in https://github.com/trezor/trezor-common/blob/master/protob/types.proto#L133 // filled CoinType Protobuf structure defined in https://github.com/trezor/trezor-common/blob/master/protob/types.proto#L133
// address types > 0xFF represent a two-byte prefix in big-endian order // address types > 0xFF represent a two-byte prefix in big-endian order
@ -69,21 +71,32 @@ const CoinType *coinByAddressType(uint32_t address_type)
return 0; return 0;
} }
bool coinExtractAddressType(const CoinType *coin, const uint8_t *addr, uint32_t *address_type) bool coinExtractAddressType(const CoinType *coin, const char *addr, uint32_t *address_type)
{ {
if (coin->has_address_type && address_check_prefix(addr, coin->address_type)) { if (!addr) return false;
uint8_t addr_raw[MAX_ADDR_RAW_SIZE];
int len = base58_decode_check(addr, addr_raw, MAX_ADDR_RAW_SIZE);
if (len >= 21) {
return coinExtractAddressTypeRaw(coin, addr_raw, address_type);
}
return false;
}
bool coinExtractAddressTypeRaw(const CoinType *coin, const uint8_t *addr_raw, uint32_t *address_type)
{
if (coin->has_address_type && address_check_prefix(addr_raw, coin->address_type)) {
*address_type = coin->address_type; *address_type = coin->address_type;
return true; return true;
} }
if (coin->has_address_type_p2sh && address_check_prefix(addr, coin->address_type_p2sh)) { if (coin->has_address_type_p2sh && address_check_prefix(addr_raw, coin->address_type_p2sh)) {
*address_type = coin->address_type_p2sh; *address_type = coin->address_type_p2sh;
return true; return true;
} }
if (coin->has_address_type_p2wpkh && address_check_prefix(addr, coin->address_type_p2wpkh)) { if (coin->has_address_type_p2wpkh && address_check_prefix(addr_raw, coin->address_type_p2wpkh)) {
*address_type = coin->address_type_p2wpkh; *address_type = coin->address_type_p2wpkh;
return true; return true;
} }
if (coin->has_address_type_p2wsh && address_check_prefix(addr, coin->address_type_p2wsh)) { if (coin->has_address_type_p2wsh && address_check_prefix(addr_raw, coin->address_type_p2wsh)) {
*address_type = coin->address_type_p2wsh; *address_type = coin->address_type_p2wsh;
return true; return true;
} }

3
firmware/coins.h
View File

@ -29,6 +29,7 @@ extern const CoinType coins[COINS_COUNT];
const CoinType *coinByShortcut(const char *shortcut); const CoinType *coinByShortcut(const char *shortcut);
const CoinType *coinByName(const char *name); const CoinType *coinByName(const char *name);
const CoinType *coinByAddressType(uint32_t address_type); const CoinType *coinByAddressType(uint32_t address_type);
bool coinExtractAddressType(const CoinType *coin, const uint8_t *addr, uint32_t *address_type); bool coinExtractAddressType(const CoinType *coin, const char *addr, uint32_t *address_type);
bool coinExtractAddressTypeRaw(const CoinType *coin, const uint8_t *addr_raw, uint32_t *address_type);
#endif #endif

4
firmware/fsm.c
View File

@ -754,13 +754,13 @@ void fsm_msgVerifyMessage(VerifyMessage *msg)
} }
const CoinType *coin = fsm_getCoin(msg->coin_name); const CoinType *coin = fsm_getCoin(msg->coin_name);
if (!coin) return; if (!coin) return;
layoutProgressSwipe("Verifying", 0);
uint8_t addr_raw[MAX_ADDR_RAW_SIZE]; uint8_t addr_raw[MAX_ADDR_RAW_SIZE];
uint32_t address_type; uint32_t address_type;
if (!coinExtractAddressType(coin, (const uint8_t *)msg->address, &address_type) || !ecdsa_address_decode(msg->address, address_type, addr_raw)) { if (!coinExtractAddressType(coin, msg->address, &address_type) || !ecdsa_address_decode(msg->address, address_type, addr_raw)) {
fsm_sendFailure(FailureType_Failure_InvalidSignature, "Invalid address"); fsm_sendFailure(FailureType_Failure_InvalidSignature, "Invalid address");
return; return;
} }
layoutProgressSwipe("Verifying", 0);
if (msg->signature.size == 65 && cryptoMessageVerify(coin, msg->message.bytes, msg->message.size, address_type, addr_raw, msg->signature.bytes) == 0) { if (msg->signature.size == 65 && cryptoMessageVerify(coin, msg->message.bytes, msg->message.size, address_type, addr_raw, msg->signature.bytes) == 0) {
layoutVerifyAddress(msg->address); layoutVerifyAddress(msg->address);
if (!protectButton(ButtonRequestType_ButtonRequest_Other, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_Other, false)) {