arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-18 04:18:10 +00:00
Code Issues Releases Wiki Activity

feat(legacy): Show progress in GetFirmwareHash.

Browse Source
This commit is contained in:
Andrew Kozlik 2022-05-03 01:32:41 +02:00 committed by Martin Milata
parent 485ee6e209
commit bd8d9c9c6b
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
legacy/firmware/fsm_msg_common.h
View File

@ -537,14 +537,20 @@ void fsm_msgGetNextU2FCounter() {
layoutHome(); layoutHome();
} }
static void progress_callback(uint32_t iter, uint32_t total) {
layoutProgress(_("Please wait"), 1000 * iter / total);
}
void fsm_msgGetFirmwareHash(const GetFirmwareHash *msg) { void fsm_msgGetFirmwareHash(const GetFirmwareHash *msg) {
RESP_INIT(FirmwareHash); RESP_INIT(FirmwareHash);
layoutProgressSwipe(_("Please wait"), 0);
if (memory_firmware_hash(msg->challenge.bytes, msg->challenge.size, if (memory_firmware_hash(msg->challenge.bytes, msg->challenge.size,
resp->hash.bytes) != 0) { progress_callback, resp->hash.bytes) != 0) {
fsm_sendFailure(FailureType_Failure_FirmwareError, NULL); fsm_sendFailure(FailureType_Failure_FirmwareError, NULL);
return; return;
} }
resp->hash.size = sizeof(resp->hash.bytes); resp->hash.size = sizeof(resp->hash.bytes);
msg_write(MessageType_MessageType_FirmwareHash, resp); msg_write(MessageType_MessageType_FirmwareHash, resp);
layoutHome();
} }

6
legacy/memory.c
View File

@ -22,6 +22,7 @@
#include <stdint.h> #include <stdint.h>
#include "blake2s.h" #include "blake2s.h"
#include "flash.h" #include "flash.h"
#include "layout.h"
#include "sha2.h" #include "sha2.h"
#define FLASH_OPTION_BYTES_1 (*(const uint64_t *)0x1FFFC000) #define FLASH_OPTION_BYTES_1 (*(const uint64_t *)0x1FFFC000)
@ -86,6 +87,7 @@ int memory_bootloader_hash(uint8_t *hash) {
} }
int memory_firmware_hash(const uint8_t *challenge, uint32_t challenge_size, int memory_firmware_hash(const uint8_t *challenge, uint32_t challenge_size,
void (*progress_callback)(uint32_t, uint32_t),
uint8_t hash[BLAKE2S_DIGEST_LENGTH]) { uint8_t hash[BLAKE2S_DIGEST_LENGTH]) {
BLAKE2S_CTX ctx; BLAKE2S_CTX ctx;
if (challenge_size != 0) { if (challenge_size != 0) {
@ -104,6 +106,10 @@ int memory_firmware_hash(const uint8_t *challenge, uint32_t challenge_size,
return 1; return 1;
} }
blake2s_Update(&ctx, data, size); blake2s_Update(&ctx, data, size);
if (progress_callback != NULL) {
progress_callback(i - FLASH_CODE_SECTOR_FIRST,
FLASH_CODE_SECTOR_LAST - FLASH_CODE_SECTOR_FIRST);
}
} }
return blake2s_Final(&ctx, hash, BLAKE2S_DIGEST_LENGTH); return blake2s_Final(&ctx, hash, BLAKE2S_DIGEST_LENGTH);

1
legacy/memory.h
View File

@ -94,6 +94,7 @@ void memory_protect(void);
void memory_write_unlock(void); void memory_write_unlock(void);
int memory_bootloader_hash(uint8_t *hash); int memory_bootloader_hash(uint8_t *hash);
int memory_firmware_hash(const uint8_t *challenge, uint32_t challenge_size, int memory_firmware_hash(const uint8_t *challenge, uint32_t challenge_size,
void (*progress_callback)(uint32_t, uint32_t),
uint8_t hash[32]); uint8_t hash[32]);
static inline void flash_write32(uint32_t addr, uint32_t word) { static inline void flash_write32(uint32_t addr, uint32_t word) {