coldcard/firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

backport v4 fix, files

Browse Source
This commit is contained in:
Peter D. Gray 2022-11-14 15:10:02 -05:00
parent ebf8a87eeb
commit 064778b418
No known key found for this signature in database
GPG Key ID: F0E6CC6AFC16CF7B
8 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/signit.py
View File

@ -288,6 +288,12 @@ def doit(keydir, outfn=None, build_dir=None, high_water=False,
assert len(body) >= FW_MIN_LENGTH, "main firmware is too small: %d" % len(body)
body_len = align_to(len(body), 512)
if hw_compat & (MK_1_OK | MK_2_OK | MK_3_OK):
# bugfix: size must be non-page aligned, so extra bytes are erased past end
if (body_len % 4096) == 0:
body_len += 512
assert body_len % 512 == 0, body_len
# pad out

4
releases/ChangeLog-mk3.md
View File

@ -1,3 +1,7 @@
## 4.1.7 - Nov 15, 2022
- Bugfix: Upgrades to 4.1.6 version using SD Card did not work due to an obscure alignment
bug. USB upgrade did work. A workaround to this issue has been added for this release.
## 4.1.6 - Oct 5, 2022
- Bugfix: order of multisig wallet registration does NOT matter in PSBT signing

3
releases/ChangeLog.md
View File

@ -1,3 +1,6 @@
## 5.0.8 - 2022-11-??
- tbd
## 5.0.7 - 2022-10-05
- NFC Enhancements:

6
stm32/COLDCARD/file_time.c
View File

@ -2,12 +2,12 @@
//
// AUTO-generated.
//
// built: 2022-10-05
// version: 5.0.7
// built: 2022-11-14
// version: 5.0.8
//
#include <stdint.h>
// this overrides ports/stm32/fatfs_port.c
uint32_t get_fattime(void) {
return 0x55452800UL;
return 0x556e2800UL;
}

6
stm32/COLDCARD_MK4/file_time.c
View File

@ -2,12 +2,12 @@
//
// AUTO-generated.
//
// built: 2022-09-14
// version: 5.0.7
// built: 2022-11-14
// version: 5.0.8
//
#include <stdint.h>
// this overrides ports/stm32/fatfs_port.c
uint32_t get_fattime(void) {
return 0x552e2800UL;
return 0x556e2800UL;
}

2
stm32/mk4-bootloader/firmware-keys.h
View File

@ -46,7 +46,6 @@ static const uint8_t approved_pubkeys[NUM_KNOWN_PUBKEYS][64] = {
0xd8, 0xfc, 0xa1, 0x17, 0x66, 0xb5, 0x0b, 0xfe, 0x63, 0x40, 0x21,
0x89, 0xc9, 0x92, 0x7b, 0x8e, 0x72, 0xdf, 0x0b, 0x59
},
#if 0
{ // 5: future
0xd0, 0x5c, 0xdc, 0x76, 0x16, 0x30, 0xdd, 0x30, 0xc2, 0x80, 0xf1,
0x56, 0x26, 0x5c, 0xa8, 0x61, 0xd7, 0x4f, 0x69, 0x69, 0xe5, 0xb8,
@ -55,7 +54,6 @@ static const uint8_t approved_pubkeys[NUM_KNOWN_PUBKEYS][64] = {
0x80, 0x7e, 0x7c, 0x13, 0xd5, 0x4f, 0x4b, 0x5e, 0x9b, 0x4c, 0x9b,
0xd5, 0x9e, 0x1d, 0xd8, 0xe0, 0xad, 0xc0, 0x46, 0x22
},
#endif
};
#define IS_FACTORY_KEY(kn) (kn != 0)

10
stm32/shared.mk
View File

@ -21,6 +21,8 @@ DEBUG_BUILD ?= 0
# aka ../cli/signit.py
SIGNIT = signit
PROD_KEYNUM = -k 1
BUILD_DIR = l-port/build-$(BOARD)
MAKE_ARGS = BOARD=$(BOARD) -j 4 EXCLUDE_NGU_TESTS=1 DEBUG_BUILD=$(DEBUG_BUILD)
@ -58,7 +60,7 @@ dfu: firmware-signed.dfu
.PHONY: dev.dfu
dev.dfu: $(BUILD_DIR)/firmware0.bin
cd $(PORT_TOP) && $(MAKE) $(MAKE_ARGS)
$(SIGNIT) sign -b $(BUILD_DIR) -m $(MK_NUM) $(VERSION_STRING) -k 1 -o dev.bin
$(SIGNIT) sign -b $(BUILD_DIR) -m $(MK_NUM) $(VERSION_STRING) $(PROD_KEYNUM) -o dev.bin
$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):dev.bin dev.dfu
.PHONY: relink
@ -78,7 +80,7 @@ $(BOARD)/file_time.c: make_filetime.py version.mk
# - when executed in a repro w/o the required key, it defaults to key zero
# - and that's what happens inside the Docker build
production.bin: firmware-signed.bin Makefile
$(SIGNIT) sign -m $(MK_NUM) $(VERSION_STRING) -r firmware-signed.bin -k 1 -o $@
$(SIGNIT) sign -m $(MK_NUM) $(VERSION_STRING) -r firmware-signed.bin $(PROD_KEYNUM) -o $@
SUBMAKE = $(MAKE) -f MK$(MK_NUM)-Makefile
@ -95,7 +97,7 @@ release: code-committed
rc1:
$(SUBMAKE) clean # critical, or else you get a mix of debug/not
$(SUBMAKE) DEBUG_BUILD=0 all
$(SIGNIT) sign -b $(BUILD_DIR) -m $(MK_NUM) $(VERSION_STRING) -k 1 -o rc1.bin
$(SIGNIT) sign -b $(BUILD_DIR) -m $(MK_NUM) $(VERSION_STRING) $(PROD_KEYNUM) -o rc1.bin
$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):rc1.bin \
-b $(BOOTLOADER_BASE):$(BOOTLOADER_DIR)/releases/$(BOOTLOADER_VERSION)/bootloader.bin \
`signit version rc1.bin`-mk$(MK_NUM)-RC1-coldcard.dfu
@ -110,7 +112,7 @@ release-products: built/production.bin
test ! -f $(RELEASE_FNAME)
cp built/file_time.c $(BOARD)/file_time.c
-git commit $(BOARD)/file_time.c -m "For $(NEW_VERSION)"
$(SIGNIT) sign -m $(MK_NUM) $(VERSION_STRING) -r built/production.bin -k 1 -o built/production.bin
$(SIGNIT) sign -m $(MK_NUM) $(VERSION_STRING) -r built/production.bin $(PROD_KEYNUM) -o built/production.bin
$(PYTHON_MAKE_DFU) -b $(FIRMWARE_BASE):built/production.bin \
-b $(BOOTLOADER_BASE):$(BOOTLOADER_DIR)/releases/$(BOOTLOADER_VERSION)/bootloader.bin \
$(RELEASE_FNAME)

2
stm32/version.mk
View File

@ -1,4 +1,4 @@
# Our version for this release.
VERSION_STRING = 5.0.7
VERSION_STRING = 5.0.8