Fix for ED25519 default image header size not being set. Fixed others to allow override.

pull/186/head
David Garske 2022-03-23 10:05:00 -07:00 committed by Daniele Lacamera
parent c8a59c2418
commit a56abdcffb
1 changed files with 4 additions and 3 deletions

View File

@ -58,6 +58,7 @@ ifeq ($(SIGN),ED25519)
PUBLIC_KEY_OBJS=./src/ed25519_pub_key.o PUBLIC_KEY_OBJS=./src/ed25519_pub_key.o
CFLAGS+=-D"WOLFBOOT_SIGN_ED25519" CFLAGS+=-D"WOLFBOOT_SIGN_ED25519"
STACK_USAGE?=1180 STACK_USAGE?=1180
IMAGE_HEADER_SIZE?=256
endif endif
ifeq ($(SIGN),ED448) ifeq ($(SIGN),ED448)
@ -83,14 +84,14 @@ ifeq ($(SIGN),ED448)
endif endif
PUBLIC_KEY_OBJS=./src/ed448_pub_key.o PUBLIC_KEY_OBJS=./src/ed448_pub_key.o
CFLAGS+=-D"WOLFBOOT_SIGN_ED448" CFLAGS+=-D"WOLFBOOT_SIGN_ED448"
IMAGE_HEADER_SIZE=512 IMAGE_HEADER_SIZE?=512
endif endif
ifeq ($(SIGN),RSA2048) ifeq ($(SIGN),RSA2048)
KEYGEN_OPTIONS+=--rsa2048 KEYGEN_OPTIONS+=--rsa2048
SIGN_OPTIONS+=--rsa2048 SIGN_OPTIONS+=--rsa2048
PRIVATE_KEY=rsa2048.der PRIVATE_KEY=rsa2048.der
IMAGE_HEADER_SIZE=512 IMAGE_HEADER_SIZE?=512
WOLFCRYPT_OBJS+= \ WOLFCRYPT_OBJS+= \
$(RSA_EXTRA_OBJS) \ $(RSA_EXTRA_OBJS) \
$(MATH_OBJS) \ $(MATH_OBJS) \
@ -119,7 +120,7 @@ ifeq ($(SIGN),RSA4096)
KEYGEN_OPTIONS+=--rsa4096 KEYGEN_OPTIONS+=--rsa4096
SIGN_OPTIONS+=--rsa4096 SIGN_OPTIONS+=--rsa4096
PRIVATE_KEY=rsa4096.der PRIVATE_KEY=rsa4096.der
IMAGE_HEADER_SIZE=1024 IMAGE_HEADER_SIZE?=1024
WOLFCRYPT_OBJS+= \ WOLFCRYPT_OBJS+= \
$(RSA_EXTRA_OBJS) \ $(RSA_EXTRA_OBJS) \
$(MATH_OBJS) \ $(MATH_OBJS) \