storage: wipe storage after 15 wrong pins

pull/25/head
Pavol Rusnak 7 years ago
parent fa2f5fb33f
commit c778d7b9c3
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D

@ -318,10 +318,7 @@ void fsm_msgWipeDevice(WipeDevice *msg)
layoutHome();
return;
}
storage_reset();
storage_reset_uuid();
storage_commit();
storage_clearPinArea();
storage_wipe();
// the following does not work on Mac anyway :-/ Linux/Windows are fine, so it is not needed
// usbReconnect(); // force re-enumeration because of the serial number change
fsm_sendSuccess(_("Device wiped"));

@ -30,6 +30,8 @@
#include "debug.h"
#include "gettext.h"
#define MAX_WRONG_PINS 15
bool protectAbortedByInitialize = false;
bool protectButton(ButtonRequestType type, bool confirm_only)
@ -183,14 +185,23 @@ bool protectPin(bool use_cached)
fsm_sendFailure(FailureType_Failure_PinCancelled, NULL);
return false;
}
if (storage_increasePinFails(fails) && storage_containsPin(pin)) {
if (!storage_increasePinFails(fails)) {
fsm_sendFailure(FailureType_Failure_PinInvalid, NULL);
return false;
}
if (storage_containsPin(pin)) {
session_cachePin();
storage_resetPinFails(fails);
return true;
} else {
fsm_sendFailure(FailureType_Failure_PinInvalid, NULL);
return false;
if (~*fails > MAX_WRONG_PINS) {
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, _("Too many wrong PINs"), _("entered. Storage has"), _("been wiped."), NULL, _("Please unplug"), _("the device."));
storage_wipe();
for (;;) {} // loop forever
}
}
fsm_sendFailure(FailureType_Failure_PinInvalid, NULL);
return false;
}
bool protectChangePin(void)

@ -622,3 +622,11 @@ void storage_setU2FCounter(uint32_t u2fcounter)
storage.u2f_counter = u2fcounter - storage_u2f_offset;
storage_commit();
}
void storage_wipe(void)
{
storage_reset();
storage_reset_uuid();
storage_commit();
storage_clearPinArea();
}

@ -73,6 +73,8 @@ bool storage_needsBackup(void);
void storage_applyFlags(uint32_t flags);
uint32_t storage_getFlags(void);
void storage_wipe(void);
extern Storage storage;
extern char storage_uuid_str[25];

Loading…
Cancel
Save