Skip to content

Commit 94af1b7

Browse files
committed
Fixed MacOS compatibility + python3 requirement
1 parent 75fc9cc commit 94af1b7

4 files changed

Lines changed: 7 additions & 8 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,14 +151,14 @@ test-app/image.bin:
151151
include tools/test.mk
152152

153153
ed25519.der:
154-
@tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ed25519_pub_key.c
154+
@python3 tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ed25519_pub_key.c
155155

156156
ecc256.der:
157-
@tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ecc256_pub_key.c
157+
@python3 tools/keytools/keygen.py $(KEYGEN_OPTIONS) src/ecc256_pub_key.c
158158

159159
factory.bin: $(BOOT_IMG) wolfboot-align.bin $(PRIVATE_KEY)
160160
@echo "\t[SIGN] $(BOOT_IMG)"
161-
$(Q)tools/keytools/sign.py $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1
161+
$(Q)python3 tools/keytools/sign.py $(SIGN_OPTIONS) $(BOOT_IMG) $(PRIVATE_KEY) 1
162162
@echo "\t[MERGE] $@"
163163
@cat wolfboot-align.bin test-app/image_v1_signed.bin > $@
164164

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ projects to provide a secure firmware update mechanism.
2121

2222
This repository contains the following components:
2323
- the wolfBoot bootloader
24-
- Ed25519 key generator and image signing tools
25-
- Ecc256 key generator and image signing tools
24+
- key generator and image signing tools (requires python 3.x)
2625
- Baremetal test applications
2726

2827
### wolfBoot bootloader

lib/wolfssl

Submodule wolfssl updated 582 files

tools/test.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ test-spi-off: FORCE
4343

4444
test-update: test-app/image.bin FORCE
4545
@dd if=/dev/zero bs=131067 count=1 2>/dev/null | tr "\000" "\377" > test-update.bin
46-
@$(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
46+
@python3 $(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
4747
@dd if=test-app/image_v$(TEST_UPDATE_VERSION)_signed.bin of=test-update.bin bs=1 conv=notrunc
4848
@printf "pBOOT" >> test-update.bin
4949
@make test-reset
@@ -53,7 +53,7 @@ test-update: test-app/image.bin FORCE
5353
(make test-reset && sleep 1 && st-flash --reset write test-update.bin 0x08040000)
5454

5555
test-update-ext: test-app/image.bin FORCE
56-
@$(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
56+
@python3 $(SIGN_TOOL) test-app/image.bin $(PRIVATE_KEY) $(TEST_UPDATE_VERSION)
5757
@$$(dd if=/dev/zero bs=1M count=1 | tr '\000' '\377' > test-update.rom)
5858
@dd if=test-app/image_v$(TEST_UPDATE_VERSION)_signed.bin of=test-update.rom bs=1 count=524283 conv=notrunc
5959
@printf "pBOOT" | dd of=test-update.rom obs=1 seek=524283 count=5 conv=notrunc

0 commit comments

Comments
 (0)