arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-15 20:19:23 +00:00
Code Issues Releases Wiki Activity

cleanup Waking up screen usage

Browse Source
This commit is contained in:
Pavol Rusnak 2016-01-19 15:36:43 +01:00
parent 285f06fe2f
commit 1d3c7ee3f2
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/storage.c
View File

@ -270,7 +270,6 @@ bool storage_getRootNode(HDNode *node)
uint8_t secret[64];
uint8_t salt[12];
memcpy(salt, "TREZORHD", 8);
layoutProgressSwipe("Waking up", 0);
pbkdf2_hmac_sha512((const uint8_t *)sessionPassphrase, strlen(sessionPassphrase), salt, 8, BIP39_PBKDF2_ROUNDS, secret, 64, get_root_node_callback);
aes_decrypt_ctx ctx;
aes_decrypt_key256(secret, &ctx);
@ -288,7 +287,6 @@ bool storage_getRootNode(HDNode *node)
return false;
}
uint8_t seed[64];
layoutProgressSwipe("Waking up", 0);
mnemonic_to_seed(storage.mnemonic, sessionPassphrase, seed, get_root_node_callback); // BIP-0039
if (hdnode_from_seed(seed, sizeof(seed), &sessionRootNode) == 0) {
return false;

2
vendor/trezor-crypto vendored

@ -1 +1 @@
Subproject commit 9a8e982153d3acab75c0707e3c88872f6c5c781c
Subproject commit fbc0df736a6583d1fa3b89d4e57889bd9ad3a191