diff --git a/docs/bootloader.md b/docs/bootloader.md index bfa9f8a7e7..114a0d9f2b 100644 --- a/docs/bootloader.md +++ b/docs/bootloader.md @@ -60,7 +60,7 @@ TREZOR Core firmware consists of 3 parts: ###Vendor Header -Total length of vendor header is 82 + 32 * (number of pubkeys) + (length of vendor string) + (length of vendor image) bytes rounded up to the closest multiply of 256 bytes. +Total length of vendor header is 84 + 32 * (number of pubkeys) + (length of vendor string) + (length of vendor image) bytes rounded up to the closest multiply of 256 bytes. | offset | length | name | description | |-------:|-------:|------|-------------| diff --git a/micropython/stmhal/Makefile.bootloader b/micropython/stmhal/Makefile.bootloader index 7d1a7689c1..a8793f3939 100644 --- a/micropython/stmhal/Makefile.bootloader +++ b/micropython/stmhal/Makefile.bootloader @@ -83,6 +83,7 @@ SRC_C = \ bootloader/basic.c \ bootloader/bootloader.c \ bootloader/crypto.c \ + bootloader/header.c \ bootloader/ui.c \ system_stm32.c \ $(wildcard boards/$(BOARD)/*.c) diff --git a/micropython/stmhal/bootloader/header.c b/micropython/stmhal/bootloader/header.c new file mode 100644 index 0000000000..2dba30199a --- /dev/null +++ b/micropython/stmhal/bootloader/header.c @@ -0,0 +1,29 @@ +#include +#include "header.h" + +bool read_header(const uint8_t *data, uint32_t *expiry, uint32_t *version, uint8_t *sigidx, uint8_t *sig) +{ + uint32_t magic; + memcpy(&magic, data, 4); + if (magic != 0x425A5254) return false; // TRZB + + uint32_t hdrlen; + memcpy(&hdrlen, data + 4, 4); + if (hdrlen != 256) return false; + + memcpy(expiry, data + 8, 4); + + uint32_t codelen; + memcpy(&codelen, data + 12, 4); + if (codelen != 64 * 1024) return false; + + memcpy(version, data + 16, 4); + + // reserved + + memcpy(sigidx, data + 0x00BF, 1); + + memcpy(sig, data + 0x00C0, 64); + + return true; +} diff --git a/micropython/stmhal/bootloader/header.h b/micropython/stmhal/bootloader/header.h new file mode 100644 index 0000000000..272b46b105 --- /dev/null +++ b/micropython/stmhal/bootloader/header.h @@ -0,0 +1,9 @@ +#ifndef __BOOTLOADER_HEADER_H__ +#define __BOOTLOADER_HEADER_H__ + +#include +#include + +bool read_header(const uint8_t *data, uint32_t *expiry, uint32_t *version, uint8_t *sigidx, uint8_t *sig); + +#endif diff --git a/micropython/stmhal/bootloader/toi_trezor.h b/micropython/stmhal/bootloader/toi_trezor.h deleted file mode 100644 index e0d18e0b03..0000000000 --- a/micropython/stmhal/bootloader/toi_trezor.h +++ /dev/null @@ -1,3 +0,0 @@ -static const uint8_t toi_trezor[] = { - 0xed, 0xd2, 0x4b, 0x6c, 0x1b, 0x45, 0x18, 0x07, 0xf0, 0xb1, 0xe3, 0x3c, 0x9a, 0x26, 0xb1, 0xcb, 0x05, 0xa1, 0x1e, 0xba, 0x0a, 0x12, 0x5c, 0x2a, 0xc5, 0x48, 0x70, 0x43, 0x24, 0x97, 0x5e, 0x38, 0x34, 0xa9, 0x78, 0x9c, 0x80, 0xf8, 0x42, 0xa5, 0x4a, 0x48, 0xc9, 0x09, 0xb8, 0xc5, 0x1c, 0x28, 0xe2, 0x94, 0x70, 0x43, 0x08, 0x48, 0x04, 0x48, 0x08, 0x21, 0x35, 0x15, 0x47, 0x54, 0x51, 0xa4, 0x22, 0xc4, 0xc3, 0x60, 0xab, 0xaa, 0x04, 0x87, 0x80, 0x2b, 0x21, 0x1e, 0x02, 0x81, 0x9d, 0xc4, 0x49, 0x5c, 0xbf, 0x3e, 0x76, 0x67, 0x66, 0x77, 0xc7, 0xeb, 0xdd, 0xb5, 0xbd, 0xbb, 0xdf, 0x46, 0xad, 0xbe, 0xff, 0xc1, 0x9e, 0xd9, 0x99, 0x9d, 0xdf, 0xce, 0xcc, 0xc7, 0x18, 0x85, 0x42, 0xa1, 0x50, 0x28, 0x14, 0x0a, 0x85, 0x42, 0xb9, 0x57, 0x33, 0x72, 0xe9, 0xda, 0xce, 0xf7, 0xaf, 0x6b, 0x31, 0xab, 0x13, 0x3f, 0x82, 0xc8, 0x3f, 0xb9, 0x18, 0xd5, 0xc4, 0xfb, 0x60, 0xe7, 0xa7, 0xd8, 0xd8, 0x54, 0x11, 0xd4, 0x34, 0x32, 0x31, 0xb1, 0x65, 0x80, 0x63, 0x80, 0x13, 0xd7, 0xc1, 0x99, 0x7a, 0x1c, 0xee, 0x1a, 0xf4, 0x66, 0x1f, 0x9f, 0x9d, 0x06, 0xb7, 0xe4, 0xb1, 0xd9, 0x11, 0x57, 0x16, 0xda, 0xd8, 0xee, 0xa2, 0xbb, 0x0b, 0xbb, 0xb8, 0xec, 0x18, 0x78, 0x45, 0x43, 0x75, 0x57, 0x3c, 0x5d, 0xd4, 0x0d, 0x8f, 0x82, 0x77, 0x30, 0xdd, 0x79, 0x1f, 0xb7, 0x8a, 0xe8, 0xfa, 0xb0, 0xd0, 0xc2, 0x63, 0xa7, 0xbb, 0x9c, 0xcb, 0xe7, 0x2e, 0x55, 0xd4, 0x07, 0x1b, 0x68, 0xee, 0xba, 0x8d, 0xb4, 0xb5, 0x9e, 0x0b, 0x47, 0xab, 0xac, 0x84, 0x6d, 0xd4, 0xad, 0x67, 0x45, 0xeb, 0x59, 0x07, 0xcb, 0x9d, 0xb2, 0x88, 0x86, 0xfd, 0x30, 0x69, 0x9f, 0x75, 0x1e, 0xc9, 0x5d, 0xb4, 0x84, 0xac, 0xf2, 0x74, 0x1c, 0xbd, 0xa2, 0xad, 0x9d, 0xdd, 0xee, 0x7a, 0x3c, 0xef, 0x72, 0x0a, 0x51, 0x26, 0x65, 0xd5, 0x54, 0xf7, 0xf3, 0xa4, 0xb5, 0x61, 0x1c, 0x77, 0xda, 0x7d, 0xbb, 0x8c, 0xcd, 0x99, 0x03, 0xab, 0x28, 0x6e, 0xda, 0x6b, 0x5b, 0x29, 0xdc, 0x0b, 0xde, 0x96, 0xab, 0xef, 0x7b, 0x8e, 0xec, 0xa2, 0xb8, 0xe6, 0xae, 0xae, 0x7a, 0x9e, 0x44, 0x13, 0xd5, 0xed, 0x1d, 0x19, 0xc1, 0x2c, 0xac, 0x09, 0xb9, 0x76, 0xdd, 0x65, 0xac, 0x82, 0xe8, 0xce, 0xf8, 0x14, 0xcf, 0xa2, 0x1c, 0xcb, 0x21, 0x96, 0x73, 0x69, 0xc8, 0xb1, 0xa8, 0x5c, 0xcd, 0x65, 0x6c, 0xca, 0xe7, 0x2c, 0xc2, 0x66, 0xce, 0xe7, 0x0e, 0x53, 0x88, 0xee, 0x8a, 0x58, 0xba, 0xe3, 0x57, 0xeb, 0x18, 0xee, 0xb6, 0x58, 0xba, 0xe5, 0x3a, 0x58, 0xc1, 0x73, 0x8b, 0x62, 0xe9, 0xba, 0xeb, 0x60, 0x59, 0x0c, 0xee, 0x21, 0xb8, 0x72, 0x4b, 0x87, 0x7e, 0x6e, 0x0d, 0xcf, 0xad, 0xf9, 0x1d, 0x06, 0x86, 0x0b, 0x03, 0xb8, 0x07, 0xe4, 0x92, 0x4b, 0x2e, 0xb9, 0xe4, 0xd6, 0x4e, 0x3d, 0xf6, 0xea, 0xa7, 0x3f, 0x54, 0xc0, 0x4c, 0x67, 0xe7, 0x93, 0xcb, 0x4f, 0x65, 0xf0, 0x5d, 0xdf, 0x1c, 0x97, 0x5b, 0x8f, 0x1a, 0x4d, 0x15, 0x61, 0xb0, 0x34, 0xb4, 0x28, 0xd9, 0x15, 0x18, 0x3c, 0x37, 0xa3, 0x63, 0xd7, 0x61, 0x98, 0xfc, 0x16, 0x15, 0x3b, 0x05, 0xc3, 0x25, 0x1f, 0x91, 0xbb, 0x38, 0xa4, 0x5b, 0x8d, 0xc8, 0x5d, 0x26, 0x97, 0x5c, 0x72, 0xc9, 0xbd, 0x4b, 0xdd, 0xff, 0x76, 0x3e, 0x7f, 0xfb, 0x8d, 0x97, 0x2f, 0xbe, 0xf8, 0xec, 0xc5, 0x57, 0xde, 0x7c, 0xe7, 0xda, 0xaf, 0x15, 0x7c, 0xb7, 0xf3, 0x71, 0xd6, 0x7d, 0xca, 0x43, 0xef, 0x21, 0xba, 0xb7, 0x7c, 0x67, 0x25, 0x36, 0x91, 0xdc, 0x52, 0xbf, 0x79, 0x73, 0x38, 0xee, 0x42, 0xbf, 0x79, 0x69, 0x72, 0xc9, 0x25, 0x97, 0x5c, 0x72, 0xc9, 0x25, 0x97, 0x5c, 0x72, 0xc9, 0x25, 0x97, 0x5c, 0x72, 0xc9, 0x25, 0x97, 0x5c, 0x72, 0xc9, 0x25, 0x97, 0x5c, 0x72, 0xa3, 0x70, 0xff, 0xc8, 0xf8, 0x4f, 0x1b, 0xd9, 0xc6, 0x71, 0xa1, 0x7d, 0xc1, 0x6f, 0xd6, 0xc3, 0x00, 0x48, 0x2e, 0xc0, 0x0d, 0xcf, 0x39, 0x89, 0x17, 0x00, 0xd1, 0x85, 0x86, 0xc7, 0x59, 0x27, 0x8b, 0x80, 0xea, 0x02, 0xe4, 0xdd, 0x66, 0x3c, 0xa0, 0xce, 0xc0, 0x71, 0xe1, 0xb0, 0x77, 0xc2, 0x0a, 0xc4, 0xe0, 0x02, 0x2c, 0x38, 0xea, 0xb8, 0x02, 0xf1, 0xb8, 0x70, 0x53, 0x1d, 0x3d, 0xed, 0x1c, 0xc5, 0x73, 0xa1, 0x69, 0x97, 0xd7, 0x26, 0xc4, 0xe8, 0x02, 0x6c, 0x89, 0xa1, 0xd1, 0x0a, 0xc4, 0xeb, 0xc2, 0x5f, 0xc6, 0xc8, 0xe3, 0x6e, 0x23, 0xb8, 0x2e, 0xb4, 0x73, 0xec, 0x0a, 0xa0, 0xba, 0x8b, 0xee, 0xcb, 0x43, 0x19, 0x70, 0xdd, 0xc4, 0xf3, 0x30, 0x4c, 0x3e, 0x62, 0x91, 0xe5, 0xfe, 0xca, 0xc0, 0x6a, 0x73, 0x89, 0x45, 0x98, 0xe4, 0xfa, 0x80, 0xec, 0xd7, 0x2c, 0xe2, 0x3c, 0x39, 0x88, 0xda, 0x5e, 0x65, 0x91, 0x67, 0xf4, 0x7a, 0x5f, 0xf6, 0xe7, 0x0c, 0xc3, 0xc8, 0x4b, 0xfe, 0x6a, 0xe7, 0x2d, 0x86, 0x94, 0x89, 0xb2, 0x0f, 0xfb, 0xb7, 0xc6, 0xf0, 0x72, 0xc5, 0x93, 0xfd, 0x8c, 0xa1, 0xe6, 0xb4, 0xbb, 0xda, 0xca, 0x32, 0xe4, 0x24, 0xdd, 0xce, 0xfa, 0x16, 0x8b, 0x21, 0xe7, 0x7b, 0x0a, 0x6a, 0x89, 0xc5, 0x92, 0xb1, 0x6e, 0xf6, 0x80, 0xc5, 0x96, 0x35, 0x85, 0xcd, 0xb1, 0x18, 0x73, 0xc2, 0x54, 0x8f, 0x58, 0xbc, 0x49, 0x6c, 0x73, 0xf6, 0x35, 0x16, 0x7b, 0xce, 0x02, 0xdc, 0xc9, 0xb0, 0x63, 0x48, 0xea, 0x03, 0x46, 0xa1, 0x50, 0x28, 0x94, 0xbb, 0x24, 0xc9, 0x47, 0x1f, 0x09, 0xfa, 0x6a, 0x11, 0x94, 0x30, 0xab, 0xd5, 0xd0, 0x8c, 0x41, 0x65, 0xa8, 0x36, 0xa1, 0x76, 0xf8, 0xab, 0xe3, 0xbc, 0xfd, 0xbb, 0x63, 0x9d, 0x66, 0x36, 0x8c, 0x0b, 0x90, 0xeb, 0xe7, 0xce, 0x98, 0x90, 0x73, 0x9d, 0x8d, 0x50, 0x6e, 0xa7, 0x8f, 0x3b, 0x69, 0xf5, 0x8e, 0x9c, 0xeb, 0x64, 0xc2, 0xb8, 0x50, 0xf5, 0x77, 0x95, 0x6e, 0xc9, 0xb1, 0x4e, 0x35, 0x94, 0xdb, 0xf2, 0x75, 0xcf, 0x38, 0x8e, 0xa6, 0xe8, 0xe8, 0x07, 0x77, 0x21, 0xeb, 0xe7, 0x76, 0xcd, 0x2c, 0x39, 0xd6, 0xc9, 0x87, 0x72, 0xbf, 0xf4, 0x71, 0x4f, 0x76, 0xcd, 0x3c, 0x72, 0xac, 0x53, 0x0d, 0xe5, 0x56, 0x3d, 0xdd, 0x7d, 0xb6, 0x2c, 0x1a, 0xff, 0x56, 0xe4, 0x8b, 0xdd, 0xeb, 0xec, 0xf6, 0x77, 0xef, 0x9b, 0x9d, 0x9d, 0x5d, 0xd7, 0xa7, 0xb6, 0x8d, 0x06, 0x87, 0x8e, 0xf4, 0xc6, 0x8a, 0xd8, 0x95, 0xf1, 0x7b, 0x30, 0xcb, 0xa3, 0x25, 0xf8, 0xdf, 0xbc, 0x3c, 0x47, 0xee, 0xb5, 0x17, 0x98, 0xfc, 0x80, 0x2d, 0xee, 0x36, 0xf5, 0x09, 0xe7, 0x8d, 0x6e, 0x9d, 0x0d, 0x14, 0x43, 0x69, 0xf3, 0x16, 0x87, 0xf4, 0xff, 0x84, 0xd1, 0x38, 0x64, 0x62, 0x6f, 0x6a, 0x84, 0xc7, 0x52, 0xf6, 0x35, 0x16, 0xc5, 0xd1, 0x70, 0xd7, 0x5c, 0xa2, 0x15, 0xd4, 0x65, 0x1e, 0xee, 0xa4, 0xbc, 0x00, 0x7e, 0xbd, 0x0d, 0xfe, 0x68, 0x46, 0x1c, 0x8d, 0xe5, 0x16, 0xad, 0xc5, 0xc2, 0xb9, 0xed, 0x5f, 0x78, 0x4a, 0xd6, 0x4c, 0x00, 0x4d, 0x60, 0xa2, 0x7a, 0x92, 0xc0, 0x45, 0xcb, 0xad, 0x84, 0xd9, 0xef, 0x13, 0xf6, 0xfd, 0xaa, 0x25, 0xca, 0x0d, 0xe3, 0xf6, 0xd2, 0xc6, 0xff, 0x86, 0x78, 0xbb, 0xcc, 0x0b, 0xcb, 0x74, 0xcf, 0x1a, 0xbd, 0x3b, 0x41, 0x5c, 0xa5, 0x2a, 0x9d, 0x2e, 0xdf, 0x26, 0xe8, 0x5b, 0x9f, 0x17, 0x45, 0x6c, 0x9f, 0x41, 0x77, 0x3d, 0xef, 0x87, 0x72, 0x6f, 0xf7, 0xb8, 0x62, 0x71, 0x26, 0xab, 0x58, 0xbe, 0xcd, 0xbf, 0x21, 0xd3, 0xe5, 0x56, 0x43, 0xb9, 0x4b, 0x4e, 0x77, 0x5c, 0x1e, 0x83, 0xb9, 0x47, 0x4f, 0xf7, 0x6a, 0x18, 0xb7, 0xc3, 0x9c, 0xee, 0x1c, 0x6f, 0xe5, 0xfa, 0xef, 0x97, 0x85, 0x71, 0x77, 0x7b, 0x5c, 0xde, 0x68, 0xd9, 0x96, 0x78, 0x7b, 0xad, 0xe7, 0x7e, 0xf7, 0x42, 0xb9, 0x19, 0xa7, 0x3b, 0x2d, 0x6f, 0x9d, 0xc9, 0x7a, 0x96, 0xa7, 0x59, 0xe9, 0x71, 0xb3, 0x61, 0xdc, 0x2d, 0xd9, 0xad, 0x9d, 0xe2, 0xd1, 0xbf, 0x62, 0xd3, 0x3e, 0xc3, 0x19, 0xbb, 0x7a, 0x46, 0x8c, 0x66, 0x43, 0x75, 0x4b, 0x2c, 0x8c, 0xab, 0xc9, 0xee, 0xbe, 0x39, 0x8b, 0x03, 0x70, 0xc0, 0xdb, 0x93, 0x60, 0xbd, 0x92, 0x16, 0x93, 0x14, 0x37, 0x1f, 0xcc, 0x3d, 0x64, 0x67, 0xd4, 0x0b, 0xb5, 0xdc, 0xb4, 0x75, 0x0c, 0xe6, 0x37, 0x94, 0xac, 0x4f, 0xad, 0x72, 0xb7, 0x29, 0xe6, 0x54, 0x83, 0xb9, 0x07, 0x62, 0x37, 0x7b, 0xb2, 0x7b, 0xf4, 0x0c, 0xcf, 0x05, 0x71, 0x8f, 0x9d, 0x73, 0x46, 0xe7, 0x69, 0xb9, 0xbd, 0x55, 0xc6, 0xb6, 0xe5, 0x16, 0x85, 0x3b, 0x66, 0x74, 0xea, 0x41, 0xdd, 0xa4, 0x79, 0x91, 0xca, 0xb1, 0xd7, 0xc6, 0x95, 0x4e, 0x5b, 0x14, 0xb4, 0xfe, 0x19, 0xf2, 0x01, 0x93, 0x2e, 0xb3, 0x4b, 0x20, 0x80, 0xcb, 0xca, 0xb2, 0x2a, 0x55, 0x77, 0x42, 0xe9, 0xb4, 0xd8, 0x09, 0x50, 0x53, 0xb3, 0x5c, 0xbe, 0xfd, 0x8d, 0xa0, 0xee, 0xbc, 0xbc, 0x26, 0x6f, 0x57, 0x7c, 0x9a, 0x99, 0x0d, 0xcb, 0x1d, 0xea, 0x82, 0x7b, 0xdc, 0xb4, 0xdc, 0x84, 0x8f, 0x3b, 0xa3, 0x74, 0x75, 0xcf, 0x74, 0xa7, 0x8d, 0x7e, 0x23, 0xa8, 0x3b, 0x2a, 0xaf, 0xc9, 0xc7, 0x95, 0x95, 0x25, 0xab, 0xca, 0x72, 0x93, 0xc3, 0x5c, 0x70, 0x8f, 0x2b, 0xc0, 0x25, 0x5f, 0x77, 0x5c, 0xbd, 0x5d, 0xcb, 0x15, 0x55, 0xbf, 0x15, 0xd4, 0x5d, 0x17, 0xd7, 0xe4, 0xe7, 0x5a, 0xa5, 0xf5, 0x27, 0x53, 0xdd, 0xe5, 0x21, 0x2e, 0xf8, 0xb9, 0x42, 0xa1, 0xf0, 0x1d, 0x6f, 0xe9, 0x8d, 0xc2, 0x57, 0xfa, 0xff, 0x94, 0x68, 0x14, 0xec, 0xdc, 0x18, 0x53, 0x3a, 0xdf, 0xf2, 0xc9, 0xa3, 0x5f, 0x18, 0xdf, 0xfb, 0xa1, 0x58, 0xe3, 0x5d, 0xfd, 0xf1, 0x37, 0xfa, 0xff, 0xc9, 0x82, 0x6c, 0x60, 0x26, 0xf1, 0xa0, 0xc6, 0x28, 0x14, 0x0a, 0x85, 0x42, 0xa1, 0x50, 0x28, 0x14, 0xca, 0xbd, 0x92, 0xff, 0x01, -}; diff --git a/micropython/stmhal/bootloader/ui.c b/micropython/stmhal/bootloader/ui.c index 6aaa12879e..faf94eb548 100644 --- a/micropython/stmhal/bootloader/ui.c +++ b/micropython/stmhal/bootloader/ui.c @@ -1,43 +1,10 @@ #include "ui.h" - #include "display.h" -#include "toi_trezor.h" - #define ui_WHITE 0xFFFF #define ui_BLACK 0x0000 -#define ui_BLUE 0x24BE void screen_welcome(void) { - display_icon(0, 0, 240, 240, toi_trezor, sizeof(toi_trezor), ui_WHITE, ui_BLACK); display_text(0, 240, "bootloader", 10, FONT_MONO, ui_WHITE, ui_BLACK); } - -void screen_info(void) -{ -} - -void screen_upload_request(void) -{ -} - - -void screen_upload_progress(int permil) -{ - char label[5] = "100%"; - char *plabel = label; - // TODO: convert permil -> plabel - display_text_center(120, 192 + 32, "Uploading firmware", -1, FONT_NORMAL, ui_WHITE, ui_BLACK); - display_loader(permil, 0, ui_BLUE, ui_BLACK, 0, 0, 0); - display_text_center(120, 192 / 2 + 14 / 2, plabel, -1, FONT_BOLD, ui_WHITE, ui_BLACK); - display_refresh(); -} - -void screen_upload_success(void) -{ -} - -void screen_upload_abort(void) -{ -} diff --git a/micropython/stmhal/bootloader/ui.h b/micropython/stmhal/bootloader/ui.h index 78364af5d7..9f324bfd91 100644 --- a/micropython/stmhal/bootloader/ui.h +++ b/micropython/stmhal/bootloader/ui.h @@ -2,10 +2,5 @@ #define __BOOTLOADER_UI_H__ void screen_welcome(void); -void screen_info(void); -void screen_upload_request(void); -void screen_upload_progress(int permil); -void screen_upload_success(void); -void screen_upload_abort(void); #endif