arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-06-26 01:42:34 +00:00
Code Issues Releases Wiki Activity

refactor recovery.is_same_mnemonic function to storage_containsMnemonic

Browse Source
This commit is contained in:
Pavol Rusnak 2017-06-26 15:44:01 +02:00
parent 899852423d
commit 73708aa47e
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/protect.c
View File

@ -183,7 +183,7 @@ bool protectPin(bool use_cached)
fsm_sendFailure(FailureType_Failure_PinCancelled, NULL); fsm_sendFailure(FailureType_Failure_PinCancelled, NULL);
return false; return false;
} }
if (storage_increasePinFails(fails) && storage_isPinCorrect(pin)) { if (storage_increasePinFails(fails) && storage_containsPin(pin)) {
session_cachePin(); session_cachePin();
storage_resetPinFails(fails); storage_resetPinFails(fails);
return true; return true;

15
firmware/recovery.c
View File

@ -126,19 +126,6 @@ static void recovery_request(void) {
msg_write(MessageType_MessageType_WordRequest, &resp); msg_write(MessageType_MessageType_WordRequest, &resp);
} }
static bool is_same_mnemonic(const char *new_mnemonic) {
/* The execution time of the following code only depends on the
* (public) input. This avoids timing attacks.
*/
char diff = 0;
uint32_t i = 0;
for (; new_mnemonic[i]; i++) {
diff |= (storage.mnemonic[i] - new_mnemonic[i]);
}
diff |= storage.mnemonic[i];
return diff == 0;
}
/* Called when the last word was entered. /* Called when the last word was entered.
* Check mnemonic and send success/failure. * Check mnemonic and send success/failure.
*/ */
@ -166,7 +153,7 @@ 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 (is_same_mnemonic(new_mnemonic)) { if (storage_isInitialized() && storage_containsMnemonic(new_mnemonic)) {
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"),

22
firmware/storage.c
View File

@ -427,10 +427,26 @@ const uint8_t *storage_getHomescreen(void)
return (storage.has_homescreen && storage.homescreen.size == 1024) ? storage.homescreen.bytes : 0; return (storage.has_homescreen && storage.homescreen.size == 1024) ? storage.homescreen.bytes : 0;
} }
/* Check whether pin matches storage. The pin must be a null-terminated /* Check whether mnemonic matches storage. The mnemonic must be
* string with at most 9 characters. * a null-terminated string.
*/ */
bool storage_isPinCorrect(const char *pin) bool storage_containsMnemonic(const char *mnemonic) {
/* The execution time of the following code only depends on the
* (public) input. This avoids timing attacks.
*/
char diff = 0;
uint32_t i = 0;
for (; mnemonic[i]; i++) {
diff |= (storage.mnemonic[i] - mnemonic[i]);
}
diff |= storage.mnemonic[i];
return diff == 0;
}
/* Check whether pin matches storage. The pin must be
* a null-terminated string with at most 9 characters.
*/
bool storage_containsPin(const char *pin)
{ {
/* The execution time of the following code only depends on the /* The execution time of the following code only depends on the
* (public) input. This avoids timing attacks. * (public) input. This avoids timing attacks.

4
firmware/storage.h
View File

@ -51,7 +51,9 @@ void storage_setHomescreen(const uint8_t *data, uint32_t size);
void session_cachePassphrase(const char *passphrase); void session_cachePassphrase(const char *passphrase);
bool session_isPassphraseCached(void); bool session_isPassphraseCached(void);
bool storage_isPinCorrect(const char *pin); bool storage_containsMnemonic(const char *mnemonic);
bool storage_containsPin(const char *pin);
bool storage_hasPin(void); bool storage_hasPin(void);
void storage_setPin(const char *pin); void storage_setPin(const char *pin);
void session_cachePin(void); void session_cachePin(void);