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

recovery: zero new_mnemonic memory before returning to the user

Browse Source
This commit is contained in:
Roman Zeyde 2017-06-30 09:55:12 +03:00 committed by Pavol Rusnak
parent 87b815d6ec
commit d15dd7c944
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/recovery.c
View File

@ -144,6 +144,7 @@ static void recovery_done(void) {
// Update mnemonic on storage. // Update mnemonic on storage.
storage.has_mnemonic = true; storage.has_mnemonic = true;
strlcpy(storage.mnemonic, new_mnemonic, sizeof(new_mnemonic)); strlcpy(storage.mnemonic, new_mnemonic, sizeof(new_mnemonic));
memset(new_mnemonic, 0, sizeof(new_mnemonic));
if (!enforce_wordlist) { if (!enforce_wordlist) {
// not enforcing => mark storage as imported // not enforcing => mark storage as imported
storage.has_imported = true; storage.has_imported = true;
@ -153,7 +154,9 @@ static void recovery_done(void) {
fsm_sendSuccess(_("Device recovered")); fsm_sendSuccess(_("Device recovered"));
} else { } else {
// Inform the user about new mnemonic correctness (as well as whether it is the same as the current one). // Inform the user about new mnemonic correctness (as well as whether it is the same as the current one).
if (storage_isInitialized() && storage_containsMnemonic(new_mnemonic)) { bool match = (storage_isInitialized() && storage_containsMnemonic(new_mnemonic));
memset(new_mnemonic, 0, sizeof(new_mnemonic));
if (match) {
layoutDialog(&bmp_icon_ok, NULL, _("Confirm"), NULL, layoutDialog(&bmp_icon_ok, NULL, _("Confirm"), NULL,
_("The seed is valid"), _("The seed is valid"),
_("and MATCHES"), _("and MATCHES"),
@ -172,6 +175,7 @@ static void recovery_done(void) {
} }
} else { } else {
// New mnemonic is invalid. // New mnemonic is invalid.
memset(new_mnemonic, 0, sizeof(new_mnemonic));
if (!dry_run) { if (!dry_run) {
storage_reset(); storage_reset();
} else { } else {