arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-05-18 14:58:46 +00:00
Code Issues Releases Wiki Activity

bootloader: refactor signatures_ok return value

Browse Source
This commit is contained in:
Pavol Rusnak 2018-03-13 15:33:44 +01:00
parent e0b5526f27
commit 4af78f06a3
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bootloader/bootloader.c
View File

@ -76,8 +76,10 @@ void show_unofficial_warning(const uint8_t *hash)
// everything is OK, user pressed 2x Continue -> continue program // everything is OK, user pressed 2x Continue -> continue program
} }
void __attribute__((noreturn)) load_app(void) void __attribute__((noreturn)) load_app(int signed_firmware)
{ {
(void)signed_firmware;
// zero out SRAM // zero out SRAM
memset_reg(_ram_start, _ram_end, 0); memset_reg(_ram_start, _ram_end, 0);
@ -146,13 +148,14 @@ int main(void)
oledRefresh(); oledRefresh();
uint8_t hash[32]; uint8_t hash[32];
if (!signatures_ok(hash)) { int signed_firmware = signatures_ok(hash);
if (SIG_OK != signed_firmware) {
show_unofficial_warning(hash); show_unofficial_warning(hash);
} }
delay(100000); delay(100000);
load_app(); load_app(signed_firmware);
} }
#endif #endif

26
bootloader/signatures.c
View File

@ -51,23 +51,23 @@ int signatures_ok(uint8_t *store_hash)
memcpy(store_hash, hash, 32); memcpy(store_hash, hash, 32);
} }
if (sigindex1 < 1 || sigindex1 > PUBKEYS) return 0; // invalid index if (sigindex1 < 1 || sigindex1 > PUBKEYS) return SIG_FAIL; // invalid index
if (sigindex2 < 1 || sigindex2 > PUBKEYS) return 0; // invalid index if (sigindex2 < 1 || sigindex2 > PUBKEYS) return SIG_FAIL; // invalid index
if (sigindex3 < 1 || sigindex3 > PUBKEYS) return 0; // invalid index if (sigindex3 < 1 || sigindex3 > PUBKEYS) return SIG_FAIL; // invalid index
if (sigindex1 == sigindex2) return 0; // duplicate use if (sigindex1 == sigindex2) return SIG_FAIL; // duplicate use
if (sigindex1 == sigindex3) return 0; // duplicate use if (sigindex1 == sigindex3) return SIG_FAIL; // duplicate use
if (sigindex2 == sigindex3) return 0; // duplicate use if (sigindex2 == sigindex3) return SIG_FAIL; // duplicate use
if (ecdsa_verify_digest(&secp256k1, pubkey[sigindex1 - 1], (const uint8_t *)FLASH_META_SIG1, hash) != 0) { // failure if (0 != ecdsa_verify_digest(&secp256k1, pubkey[sigindex1 - 1], (const uint8_t *)FLASH_META_SIG1, hash)) { // failure
return 0; return SIG_FAIL;
} }
if (ecdsa_verify_digest(&secp256k1, pubkey[sigindex2 - 1], (const uint8_t *)FLASH_META_SIG2, hash) != 0) { // failure if (0 != ecdsa_verify_digest(&secp256k1, pubkey[sigindex2 - 1], (const uint8_t *)FLASH_META_SIG2, hash)) { // failure
return 0; return SIG_FAIL;
} }
if (ecdsa_verify_digest(&secp256k1, pubkey[sigindex3 - 1], (const uint8_t *)FLASH_META_SIG3, hash) != 0) { // failture if (0 != ecdsa_verify_digest(&secp256k1, pubkey[sigindex3 - 1], (const uint8_t *)FLASH_META_SIG3, hash)) { // failture
return 0; return SIG_FAIL;
} }
return 1; return SIG_OK;
} }

3
bootloader/signatures.h
View File

@ -20,6 +20,9 @@
#ifndef __SIGNATURES_H__ #ifndef __SIGNATURES_H__
#define __SIGNATURES_H__ #define __SIGNATURES_H__
#define SIG_OK 0x5A3CA5C3
#define SIG_FAIL 0x00000000
int signatures_ok(uint8_t *store_hash); int signatures_ok(uint8_t *store_hash);
#endif #endif