arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-26 17:38:39 +00:00
Code Issues Releases Wiki Activity

bootloader: add small test to SelfTest (erase/restore metadata), small refactor

Browse Source
This commit is contained in:
Pavol Rusnak 2017-06-29 18:11:19 +02:00
parent 2bf807878d
commit 425341ba44
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
1 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
bootloader/usb.c
View File

@ -282,15 +282,36 @@ static void send_msg_buttonrequest_firmwarecheck(usbd_device *dev)
, 64) != 64) {} , 64) != 64) {}
} }
static void erase_metadata_sectors(void)
{
flash_unlock();
for (int i = FLASH_META_SECTOR_FIRST; i <= FLASH_META_SECTOR_LAST; i++) {
flash_erase_sector(i, FLASH_CR_PROGRAM_X32);
}
flash_lock();
}
static void backup_metadata(uint8_t *backup)
{
memcpy(backup, (void *)FLASH_META_START, FLASH_META_LEN);
}
static void restore_metadata(const uint8_t *backup)
{
flash_unlock();
for (int i = 0; i < FLASH_META_LEN / 4; i++) {
const uint32_t *w = (const uint32_t *)(backup + i * 4);
flash_program_word(FLASH_META_START + i * 4, *w);
}
flash_lock();
}
static void hid_rx_callback(usbd_device *dev, uint8_t ep) static void hid_rx_callback(usbd_device *dev, uint8_t ep)
{ {
(void)ep; (void)ep;
static uint8_t buf[64] __attribute__((aligned(4))); static uint8_t buf[64] __attribute__((aligned(4)));
uint8_t *p;
static uint8_t towrite[4] __attribute__((aligned(4))); static uint8_t towrite[4] __attribute__((aligned(4)));
static int wi; static int wi;
int i;
uint32_t *w;
static SHA256_CTX ctx; static SHA256_CTX ctx;
if ( usbd_ep_read_packet(dev, ENDPOINT_ADDRESS_OUT, buf, 64) != 64) return; if ( usbd_ep_read_packet(dev, ENDPOINT_ADDRESS_OUT, buf, 64) != 64) return;
@ -319,6 +340,12 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
return; return;
} }
if (msg_id == 0x0020) { // SelfTest message (id 32) if (msg_id == 0x0020) { // SelfTest message (id 32)
// backup metadata
backup_metadata(meta_backup);
// erase metadata area
erase_metadata_sectors();
// copy metadata back
restore_metadata(meta_backup);
send_msg_success(dev); send_msg_success(dev);
return; return;
} }
@ -335,16 +362,16 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
} }
if (!firmware_present || button.YesUp) { if (!firmware_present || button.YesUp) {
// backup metadata // backup metadata
memcpy(meta_backup, (void *)FLASH_META_START, FLASH_META_LEN); backup_metadata(meta_backup);
flash_unlock(); flash_unlock();
// erase metadata area // erase metadata area
for (i = FLASH_META_SECTOR_FIRST; i <= FLASH_META_SECTOR_LAST; i++) { for (int i = FLASH_META_SECTOR_FIRST; i <= FLASH_META_SECTOR_LAST; i++) {
layoutProgress("ERASING ... Please wait", 1000*(i - FLASH_META_SECTOR_FIRST) / (FLASH_CODE_SECTOR_LAST - FLASH_META_SECTOR_FIRST)); layoutProgress("ERASING ... Please wait", 1000 * (i - FLASH_META_SECTOR_FIRST) / (FLASH_CODE_SECTOR_LAST - FLASH_META_SECTOR_FIRST));
flash_erase_sector(i, FLASH_CR_PROGRAM_X32); flash_erase_sector(i, FLASH_CR_PROGRAM_X32);
} }
// erase code area // erase code area
for (i = FLASH_CODE_SECTOR_FIRST; i <= FLASH_CODE_SECTOR_LAST; i++) { for (int i = FLASH_CODE_SECTOR_FIRST; i <= FLASH_CODE_SECTOR_LAST; i++) {
layoutProgress("ERASING ... Please wait", 1000*(i - FLASH_META_SECTOR_FIRST) / (FLASH_CODE_SECTOR_LAST - FLASH_META_SECTOR_FIRST)); layoutProgress("ERASING ... Please wait", 1000 * (i - FLASH_META_SECTOR_FIRST) / (FLASH_CODE_SECTOR_LAST - FLASH_META_SECTOR_FIRST));
flash_erase_sector(i, FLASH_CR_PROGRAM_X32); flash_erase_sector(i, FLASH_CR_PROGRAM_X32);
} }
layoutProgress("INSTALLING ... Please wait", 0); layoutProgress("INSTALLING ... Please wait", 0);
@ -370,7 +397,7 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
return; return;
} }
// read payload length // read payload length
p = buf + 10; uint8_t *p = buf + 10;
flash_len = readprotobufint(&p); flash_len = readprotobufint(&p);
if (flash_len > FLASH_TOTAL_SIZE + FLASH_META_DESC_LEN - (FLASH_APP_START - FLASH_ORIGIN)) { // firmware is too big if (flash_len > FLASH_TOTAL_SIZE + FLASH_META_DESC_LEN - (FLASH_APP_START - FLASH_ORIGIN)) { // firmware is too big
send_msg_failure(dev); send_msg_failure(dev);
@ -387,7 +414,7 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
towrite[wi] = *p; towrite[wi] = *p;
wi++; wi++;
if (wi == 4) { if (wi == 4) {
w = (uint32_t *)towrite; const uint32_t *w = (uint32_t *)towrite;
flash_program_word(FLASH_META_START + flash_pos, *w); flash_program_word(FLASH_META_START + flash_pos, *w);
flash_pos += 4; flash_pos += 4;
wi = 0; wi = 0;
@ -407,7 +434,7 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Error installing ", "firmware.", NULL, "Unplug your TREZOR", "and try again.", NULL); layoutDialog(&bmp_icon_error, NULL, NULL, NULL, "Error installing ", "firmware.", NULL, "Unplug your TREZOR", "and try again.", NULL);
return; return;
} }
p = buf + 1; const uint8_t *p = buf + 1;
if (flash_anim % 32 == 4) { if (flash_anim % 32 == 4) {
layoutProgress("INSTALLING ... Please wait", 1000 * flash_pos / flash_len); layoutProgress("INSTALLING ... Please wait", 1000 * flash_pos / flash_len);
} }
@ -417,7 +444,7 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
towrite[wi] = *p; towrite[wi] = *p;
wi++; wi++;
if (wi == 4) { if (wi == 4) {
w = (uint32_t *)towrite; const uint32_t *w = (const uint32_t *)towrite;
if (flash_pos < FLASH_META_DESC_LEN) { if (flash_pos < FLASH_META_DESC_LEN) {
flash_program_word(FLASH_META_START + flash_pos, *w); // the first 256 bytes of firmware is metadata descriptor flash_program_word(FLASH_META_START + flash_pos, *w); // the first 256 bytes of firmware is metadata descriptor
} else { } else {
@ -466,17 +493,10 @@ static void hid_rx_callback(usbd_device *dev, uint8_t ep)
meta_backup[2] = 0; meta_backup[2] = 0;
meta_backup[3] = 0; meta_backup[3] = 0;
} }
flash_unlock();
// erase storage // erase storage
for (i = FLASH_META_SECTOR_FIRST; i <= FLASH_META_SECTOR_LAST; i++) { erase_metadata_sectors();
flash_erase_sector(i, FLASH_CR_PROGRAM_X32); // copy storage from backup
} restore_metadata(meta_backup);
// copy it back
for (i = 0; i < FLASH_META_LEN / 4; i++) {
w = (uint32_t *)(meta_backup + i * 4);
flash_program_word(FLASH_META_START + i * 4, *w);
}
flash_lock();
} else { } else {
// replace "TRZR" in header with 0000 when hash not confirmed // replace "TRZR" in header with 0000 when hash not confirmed
if (!hash_check_ok) { if (!hash_check_ok) {