arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-02-16 01:22:02 +00:00
Code Issues Releases Wiki Activity

feat(legacy): Return fw_vendor in firmware Features message.

Browse Source 
[no changelog]
This commit is contained in:
Andrew Kozlik 2022-05-03 14:52:18 +02:00 committed by Martin Milata
parent bd8d9c9c6b
commit d693b0c196
9 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
legacy/Makefile
View File

@ -7,6 +7,7 @@ endif
OBJS += buttons.o
OBJS += common.o
OBJS += flash.o
OBJS += fw_signatures.o
OBJS += gen/bitmaps.o
OBJS += gen/fonts.o
OBJS += layout.o

2
legacy/bootloader/Makefile
View File

@ -1,7 +1,6 @@
NAME = bootloader-unaligned
OBJS += bootloader.o
OBJS += signatures.o
OBJS += usb.o
# Overrides from libtrezor.
@ -10,6 +9,7 @@ CFLAGS += -DFONT_SKIP_FIXED=1
OBJS += ../buttons.small.o
OBJS += ../common.small.o
OBJS += ../flash.small.o
OBJS += ../fw_signatures.small.o
OBJS += ../gen/bitmaps.small.o
OBJS += ../gen/fonts.small.o
OBJS += ../layout.small.o

2
legacy/bootloader/bootloader.c
View File

@ -26,12 +26,12 @@
#include "bootloader.h"
#include "buttons.h"
#include "compiler_traits.h"
#include "fw_signatures.h"
#include "layout.h"
#include "memory.h"
#include "oled.h"
#include "rng.h"
#include "setup.h"
#include "signatures.h"
#include "supervise.h"
#include "usb.h"
#include "util.h"

2
legacy/bootloader/usb.c
View File

@ -26,6 +26,7 @@
#include "bootloader.h"
#include "buttons.h"
#include "ecdsa.h"
#include "fw_signatures.h"
#include "layout.h"
#include "memory.h"
#include "memzero.h"
@ -34,7 +35,6 @@
#include "secbool.h"
#include "secp256k1.h"
#include "sha2.h"
#include "signatures.h"
#include "usb.h"
#include "util.h"

1
legacy/firmware/fsm.c
View File

@ -31,6 +31,7 @@
#include "debug.h"
#include "ecdsa.h"
#include "fsm.h"
#include "fw_signatures.h"
#include "gettext.h"
#include "hmac.h"
#include "layout2.h"

8
legacy/firmware/fsm_msg_common.h
View File

@ -18,6 +18,14 @@
*/
bool get_features(Features *resp) {
resp->has_fw_vendor = true;
const image_header *hdr =
(const image_header *)FLASH_PTR(FLASH_FWHEADER_START);
if (SIG_OK == signatures_new_ok(hdr, NULL)) {
strlcpy(resp->fw_vendor, "SatoshiLabs", sizeof(resp->fw_vendor));
} else {
strlcpy(resp->fw_vendor, "UNSAFE, DO NOT USE!", sizeof(resp->fw_vendor));
}
resp->has_vendor = true;
strlcpy(resp->vendor, "trezor.io", sizeof(resp->vendor));
resp->major_version = VERSION_MAJOR;

3
legacy/bootloader/signatures.c → legacy/fw_signatures.c
View File

@ -19,13 +19,12 @@
#include <string.h>
#include "bootloader.h"
#include "ecdsa.h"
#include "fw_signatures.h"
#include "memory.h"
#include "memzero.h"
#include "secp256k1.h"
#include "sha2.h"
#include "signatures.h"
const uint32_t FIRMWARE_MAGIC_OLD = 0x525a5254; // TRZR
const uint32_t FIRMWARE_MAGIC_NEW = 0x465a5254; // TRZF

4
legacy/bootloader/signatures.h → legacy/fw_signatures.h
View File

@ -17,8 +17,8 @@
* along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __SIGNATURES_H__
#define __SIGNATURES_H__
#ifndef __FW_SIGNATURES_H__
#define __FW_SIGNATURES_H__
#include <stdbool.h>
#include <stdint.h>

2
legacy/memory.h
View File

@ -52,7 +52,7 @@
- sig1[64], sig2[64], sig3[64]
- sigindex1[1], sigindex2[1], sigindex3[1]
* reserved[415] area is reduced to reserved[220]
- see signatures.c for more details
- see fw_signatures.c for more details
We pad the firmware chunks with zeroes if they are shorted.