arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-22 05:10:56 +00:00
Code Issues Releases Wiki Activity

Incorporated changes for updated master

Browse Source
This commit is contained in:
Jochen Hoenicke 2016-08-18 16:32:51 +02:00 committed by Alex Beregszaszi
parent efd443abe8
commit 22d0e7a053
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/ethereum.c
View File

@ -257,7 +257,7 @@ static void layoutEthereumConfirmTx(const uint8_t *to, const uint8_t *value, uin
strlcpy(_to3, "", sizeof(_to3));
}
layoutDialogSwipe(DIALOG_ICON_QUESTION,
layoutDialogSwipe(&bmp_icon_question,
"Cancel",
"Confirm",
NULL,

3
firmware/fsm.c
View File

@ -672,7 +672,8 @@ void fsm_msgEthereumGetAddress(EthereumGetAddress *msg)
resp->address.size = 20;
if (!ecdsa_get_ethereum_pubkeyhash(node->public_key, resp->address.bytes)) return;
if (!hdnode_get_ethereum_pubkeyhash(node, resp->address.bytes))
return;
if (msg->has_show_display && msg->show_display) {
char desc[16];

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit 9a8df5a4bb5de3b1ebaa28591c2ae0a5bb39348e
Subproject commit f4ed55377d67b48a94c219313faa3035186369cb