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

refactor fsm_getRootNode into fsm_getDerivedNode

Browse Source
This commit is contained in:
Pavol Rusnak 2015-01-26 13:53:06 +01:00
parent 8f48ffe63c
commit 32158bbb5c
3 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
firmware/fsm.c
View File

@ -89,7 +89,7 @@ const CoinType *fsm_getCoin(const char *name)
return coin; return coin;
} }
HDNode *fsm_getRootNode(void) const HDNode *fsm_getDerivedNode(uint32_t *address_n, size_t address_n_count)
{ {
static HDNode node; static HDNode node;
if (!storage_getRootNode(&node)) { if (!storage_getRootNode(&node)) {
@ -97,17 +97,15 @@ HDNode *fsm_getRootNode(void)
layoutHome(); layoutHome();
return 0; return 0;
} }
return &node; if (!address_n || address_n_count == 0) {
} return &node;
}
int fsm_deriveKey(HDNode *node, uint32_t *address_n, size_t address_n_count)
{
size_t i; size_t i;
if (address_n_count > 3) { if (address_n_count > 3) {
layoutProgressSwipe("Preparing keys", 0); layoutProgressSwipe("Preparing keys", 0);
} }
for (i = 0; i < address_n_count; i++) { for (i = 0; i < address_n_count; i++) {
if (hdnode_private_ckd(node, address_n[i]) == 0) { if (hdnode_private_ckd(&node, address_n[i]) == 0) {
fsm_sendFailure(FailureType_Failure_Other, "Failed to derive private key"); fsm_sendFailure(FailureType_Failure_Other, "Failed to derive private key");
layoutHome(); layoutHome();
return 0; return 0;
@ -116,7 +114,7 @@ int fsm_deriveKey(HDNode *node, uint32_t *address_n, size_t address_n_count)
layoutProgress("Preparing keys", 1000 * i / address_n_count); layoutProgress("Preparing keys", 1000 * i / address_n_count);
} }
} }
return 1; return &node;
} }
void fsm_msgInitialize(Initialize *msg) void fsm_msgInitialize(Initialize *msg)
@ -279,9 +277,8 @@ void fsm_msgGetPublicKey(GetPublicKey *msg)
{ {
RESP_INIT(PublicKey); RESP_INIT(PublicKey);
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return;
resp->node.depth = node->depth; resp->node.depth = node->depth;
resp->node.fingerprint = node->fingerprint; resp->node.fingerprint = node->fingerprint;
@ -364,7 +361,7 @@ void fsm_msgSignTx(SignTx *msg)
const CoinType *coin = fsm_getCoin(msg->coin_name); const CoinType *coin = fsm_getCoin(msg->coin_name);
if (!coin) return; if (!coin) return;
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(0, 0);
if (!node) return; if (!node) return;
signing_init(msg->inputs_count, msg->outputs_count, coin, node); signing_init(msg->inputs_count, msg->outputs_count, coin, node);
@ -404,9 +401,8 @@ void fsm_msgCipherKeyValue(CipherKeyValue *msg)
layoutHome(); layoutHome();
return; return;
} }
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return;
bool encrypt = msg->has_encrypt && msg->encrypt; bool encrypt = msg->has_encrypt && msg->encrypt;
bool ask_on_encrypt = msg->has_ask_on_encrypt && msg->ask_on_encrypt; bool ask_on_encrypt = msg->has_ask_on_encrypt && msg->ask_on_encrypt;
@ -504,9 +500,8 @@ void fsm_msgGetAddress(GetAddress *msg)
const CoinType *coin = fsm_getCoin(msg->coin_name); const CoinType *coin = fsm_getCoin(msg->coin_name);
if (!coin) return; if (!coin) return;
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return;
if (msg->has_multisig) { if (msg->has_multisig) {
layoutProgressSwipe("Preparing", 0); layoutProgressSwipe("Preparing", 0);
@ -568,9 +563,8 @@ void fsm_msgSignMessage(SignMessage *msg)
const CoinType *coin = fsm_getCoin(msg->coin_name); const CoinType *coin = fsm_getCoin(msg->coin_name);
if (!coin) return; if (!coin) return;
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return;
layoutProgressSwipe("Signing", 0); layoutProgressSwipe("Signing", 0);
if (cryptoMessageSign(msg->message.bytes, msg->message.size, node->private_key, resp->signature.bytes) == 0) { if (cryptoMessageSign(msg->message.bytes, msg->message.size, node->private_key, resp->signature.bytes) == 0) {
@ -631,7 +625,7 @@ void fsm_msgEncryptMessage(EncryptMessage *msg)
bool signing = msg->address_n_count > 0; bool signing = msg->address_n_count > 0;
RESP_INIT(EncryptedMessage); RESP_INIT(EncryptedMessage);
const CoinType *coin = 0; const CoinType *coin = 0;
HDNode *node = 0; const HDNode *node = 0;
uint8_t address_raw[21]; uint8_t address_raw[21];
if (signing) { if (signing) {
coin = coinByName(msg->coin_name); coin = coinByName(msg->coin_name);
@ -643,12 +637,11 @@ void fsm_msgEncryptMessage(EncryptMessage *msg)
layoutHome(); layoutHome();
return; return;
} }
node = fsm_getRootNode(); node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return; uint8_t public_key[33];
ecdsa_get_public_key33(node->private_key, public_key);
hdnode_fill_public_key(node); ecdsa_get_address_raw(public_key, coin->address_type, address_raw);
ecdsa_get_address_raw(node->public_key, coin->address_type, address_raw);
} }
layoutEncryptMessage(msg->message.bytes, msg->message.size, signing); layoutEncryptMessage(msg->message.bytes, msg->message.size, signing);
if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) { if (!protectButton(ButtonRequestType_ButtonRequest_ProtectCall, false)) {
@ -692,9 +685,8 @@ void fsm_msgDecryptMessage(DecryptMessage *msg)
layoutHome(); layoutHome();
return; return;
} }
HDNode *node = fsm_getRootNode(); const HDNode *node = fsm_getDerivedNode(msg->address_n, msg->address_n_count);
if (!node) return; if (!node) return;
if (fsm_deriveKey(node, msg->address_n, msg->address_n_count) == 0) return;
layoutProgressSwipe("Decrypting", 0); layoutProgressSwipe("Decrypting", 0);
RESP_INIT(DecryptedMessage); RESP_INIT(DecryptedMessage);

2
firmware/signing.c
View File

@ -196,7 +196,7 @@ void send_req_finished(void)
msg_write(MessageType_MessageType_TxRequest, &resp); msg_write(MessageType_MessageType_TxRequest, &resp);
} }
void signing_init(uint32_t _inputs_count, uint32_t _outputs_count, const CoinType *_coin, HDNode *_root) void signing_init(uint32_t _inputs_count, uint32_t _outputs_count, const CoinType *_coin, const HDNode *_root)
{ {
inputs_count = _inputs_count; inputs_count = _inputs_count;
outputs_count = _outputs_count; outputs_count = _outputs_count;

2
firmware/signing.h
View File

@ -25,7 +25,7 @@
#include "bip32.h" #include "bip32.h"
#include "types.pb.h" #include "types.pb.h"
void signing_init(uint32_t _inputs_count, uint32_t _outputs_count, const CoinType *_coin, HDNode *_root); void signing_init(uint32_t _inputs_count, uint32_t _outputs_count, const CoinType *_coin, const HDNode *_root);
void signing_abort(void); void signing_abort(void);
void signing_txack(TransactionType *tx); void signing_txack(TransactionType *tx);