WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Build coding.o unconditionally with asn.o

pull/858/head
Josh Holtrop 2026-08-12 09:12:59 -04:00 committed by Daniele Lacamera
parent b1c2db191a
commit 45ff674a87
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
options.mk
View File

@ -1,4 +1,5 @@
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/asn.o WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/asn.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o
# Shared wolfHSM client/server object lists. Defined here at the top so any # Shared wolfHSM client/server object lists. Defined here at the top so any
# downstream block (legacy WOLFHSM_CLIENT/SERVER, or WOLFCRYPT_TZ_WOLFHSM TZ # downstream block (legacy WOLFHSM_CLIENT/SERVER, or WOLFCRYPT_TZ_WOLFHSM TZ
@ -1266,7 +1267,6 @@ ifeq ($(WOLFCRYPT_TZ_WOLFHSM),1)
WOLFCRYPT_OBJS+=src/wolfhsm_callable.o WOLFCRYPT_OBJS+=src/wolfhsm_callable.o
WOLFCRYPT_OBJS+=src/wolfhsm_flash_hal.o WOLFCRYPT_OBJS+=src/wolfhsm_flash_hal.o
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hmac.o WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hmac.o
ifneq ($(SIGN),ED25519) ifneq ($(SIGN),ED25519)
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha512.o WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha512.o
@ -1428,7 +1428,6 @@ ifeq ($(DISK_LOCK),1)
ifneq ($(DISK_LOCK_PASSWORD),) ifneq ($(DISK_LOCK_PASSWORD),)
CFLAGS+=-DWOLFBOOT_ATA_DISK_LOCK_PASSWORD=\"$(DISK_LOCK_PASSWORD)\" CFLAGS+=-DWOLFBOOT_ATA_DISK_LOCK_PASSWORD=\"$(DISK_LOCK_PASSWORD)\"
endif endif
OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o
endif endif
ifeq ($(FSP), 1) ifeq ($(FSP), 1)
@ -1527,8 +1526,7 @@ WOLFHSM_CFG_CERT_MAX_VERIFY_ROOTS ?= 8
# wolfHSM client options # wolfHSM client options
ifeq ($(WOLFHSM_CLIENT),1) ifeq ($(WOLFHSM_CLIENT),1)
WOLFCRYPT_OBJS += \ WOLFCRYPT_OBJS += \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o
ifeq ($(SIGN),ML_DSA) ifeq ($(SIGN),ML_DSA)
WOLFCRYPT_OBJS += $(MATH_OBJS) WOLFCRYPT_OBJS += $(MATH_OBJS)
@ -1589,7 +1587,6 @@ ifeq ($(WOLFHSM_SERVER),1)
WOLFCRYPT_OBJS += \ WOLFCRYPT_OBJS += \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o \ $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/coding.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/random.o $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/random.o
ifeq ($(SIGN),ML_DSA) ifeq ($(SIGN),ML_DSA)
WOLFCRYPT_OBJS += $(MATH_OBJS) WOLFCRYPT_OBJS += $(MATH_OBJS)