From a6b2ce8824d66e7434558f3ffbef70d8c6bdb331 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Tue, 4 Mar 2025 14:00:05 +0000 Subject: [PATCH] Deprecate python keytools in favor of C-based keytools Co-Authored-By: daniele@wolfssl.com --- freeRTOS-Freescale-K64F-https-TLS1.3/Makefile | 6 ++++-- freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config | 7 ++----- freeRTOS-Freescale-K64F-scp/Makefile | 6 ++++-- freeRTOS-Freescale-K64F-scp/src/wolfboot.config | 7 ++----- test-app-STM32F4-measured-boot/measured.wolfboot.config | 6 +++--- 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile b/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile index 6ca8707..178d922 100644 --- a/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile +++ b/freeRTOS-Freescale-K64F-https-TLS1.3/Makefile @@ -110,13 +110,15 @@ LIBS+=build/lib/libpicotcp.a vpath %.c $(dir $(WOLFSSL_ROOT)/src) vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src) +SIGN_TOOL:=../wolfBoot/tools/keytools/sign + wolfboot:LSCRIPT:=k64f_wolfboot.ld wolfboot: image.bin wolfboot-align.bin - python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1 + $(SIGN_TOOL) --ecc256 image.bin ../wolfBoot/ecc256.der 1 cat wolfboot-align.bin image_v1_signed.bin >factory.bin sleep 1 touch image.bin - python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2 + $(SIGN_TOOL) --ecc256 image.bin ../wolfBoot/ecc256.der 2 wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \ -Isrc \ diff --git a/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config b/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config index ac397c9..ec08a52 100644 --- a/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config +++ b/freeRTOS-Freescale-K64F-https-TLS1.3/src/wolfboot.config @@ -2,11 +2,6 @@ ARCH?=ARM TARGET?=kinetis SIGN?=ECC256 HASH?=SHA256 -MCUXPRESSO?=$(HOME)/src/FRDM-K64F -MCUXPRESSO_CPU?=MK64FN1M0VLL12 -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12 -MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS -FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk DEBUG?=0 VTOR?=1 CORTEX_M0?=0 @@ -27,3 +22,5 @@ WOLFBOOT_SECTOR_SIZE?=0x1000 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000 +# CPU specific settings without absolute paths +MCUXPRESSO_CPU?=MK64FN1M0VLL12 diff --git a/freeRTOS-Freescale-K64F-scp/Makefile b/freeRTOS-Freescale-K64F-scp/Makefile index 094e5c1..fc654b5 100644 --- a/freeRTOS-Freescale-K64F-scp/Makefile +++ b/freeRTOS-Freescale-K64F-scp/Makefile @@ -122,13 +122,15 @@ LIBS+=build/lib/libpicotcp.a vpath %.c $(dir $(WOLFSSL_ROOT)/src) vpath %.c $(dir $(WOLFSSL_ROOT)/wolfcrypt/src) +SIGN_TOOL:=../wolfBoot/tools/keytools/sign + wolfboot:LSCRIPT:=k64f_wolfboot.ld wolfboot: image.bin wolfboot-align.bin - python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 1 + $(SIGN_TOOL) --ecc256 image.bin ../wolfBoot/ecc256.der 1 cat wolfboot-align.bin image_v1_signed.bin >factory.bin sleep 1 touch image.bin - python3 ../wolfBoot/tools/keytools/sign.py --ecc256 image.bin ../wolfBoot/ecc256.der 2 + $(SIGN_TOOL) --ecc256 image.bin ../wolfBoot/ecc256.der 2 wolfboot-align.bin:CFLAGS=-mthumb -Wall -Wextra -Wno-main -Wstack-usage=1024 -ffreestanding -Wno-unused \ -Isrc \ diff --git a/freeRTOS-Freescale-K64F-scp/src/wolfboot.config b/freeRTOS-Freescale-K64F-scp/src/wolfboot.config index ac397c9..ec08a52 100644 --- a/freeRTOS-Freescale-K64F-scp/src/wolfboot.config +++ b/freeRTOS-Freescale-K64F-scp/src/wolfboot.config @@ -2,11 +2,6 @@ ARCH?=ARM TARGET?=kinetis SIGN?=ECC256 HASH?=SHA256 -MCUXPRESSO?=$(HOME)/src/FRDM-K64F -MCUXPRESSO_CPU?=MK64FN1M0VLL12 -MCUXPRESSO_DRIVERS?=$(MCUXPRESSO)/devices/MK64F12 -MCUXPRESSO_CMSIS?=$(HOME)/src/FRDM-K64F/CMSIS -FREEDOM_E_SDK?=$(HOME)/src/freedom-e-sdk DEBUG?=0 VTOR?=1 CORTEX_M0?=0 @@ -27,3 +22,5 @@ WOLFBOOT_SECTOR_SIZE?=0x1000 WOLFBOOT_PARTITION_BOOT_ADDRESS?=0xA000 WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x84000 WOLFBOOT_PARTITION_SWAP_ADDRESS?=0xff000 +# CPU specific settings without absolute paths +MCUXPRESSO_CPU?=MK64FN1M0VLL12 diff --git a/test-app-STM32F4-measured-boot/measured.wolfboot.config b/test-app-STM32F4-measured-boot/measured.wolfboot.config index 005cc73..f47a45f 100644 --- a/test-app-STM32F4-measured-boot/measured.wolfboot.config +++ b/test-app-STM32F4-measured-boot/measured.wolfboot.config @@ -18,9 +18,9 @@ DUALBANK_SWAP?=0 IMAGE_HEADER_SIZE?=256 WOLFBOOT_PARTITION_SIZE?=0x20000 WOLFBOOT_SECTOR_SIZE?=0x20000 -WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x20000 -WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x40000 -WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x60000 +WOLFBOOT_PARTITION_BOOT_ADDRESS?=0x08020000 +WOLFBOOT_PARTITION_UPDATE_ADDRESS?=0x08040000 +WOLFBOOT_PARTITION_SWAP_ADDRESS?=0x08060000 WOLFTPM?=1 MEASURED_BOOT?=1 MEASURED_PCR_A?=16