Skip to content

Updated submodules to latest version #744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgarske merged 4 commits into from
Apr 7, 2026
Merged

Updated submodules to latest version #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f62dc72
Updated submodules to latest
danielinux Apr 7, 2026
c710fe9
Fixed xmalloc pools for new wolfSSL ECC+SMALLSTACK
danielinux Apr 7, 2026
201c2c5
Adjust BIGINT limits for new wolfSSL ECC+SMALLSTACK
danielinux Apr 7, 2026
c03d251
Addressed copilot's comment
danielinux Apr 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,8 @@ ifeq ($(TARGET),raspi3)
endif

ifeq ($(TARGET),sim)
CFLAGS+=-fno-pie
LDFLAGS+=-no-pie
Comment thread
danielinux marked this conversation as resolved.
MAIN_TARGET:=wolfboot.bin tools/bin-assemble/bin-assemble test-app/image_v1_signed.bin internal_flash.dd
endif

Expand Down
2 changes: 1 addition & 1 deletion lib/wolfPKCS11
Open in desktop
Submodule wolfPKCS11 updated 12 files
+74 −0 .github/workflows/wolfboot-integration.yml
+243 −75 src/crypto.c
+166 −49 src/internal.c
+10 −4 src/slot.c
+1 −1 src/wolfpkcs11.c
+548 −0 tests/aes_cbc_pad_padding_test.c
+447 −0 tests/ecb_check_value_error_test.c
+378 −0 tests/find_objects_null_template_test.c
+21 −0 tests/include.am
+12 −1 tests/pkcs11mtt.c
+621 −9 tests/pkcs11test.c
+14 −0 wolfpkcs11/internal.h
2 changes: 1 addition & 1 deletion lib/wolfPSA
Open in desktop
Submodule wolfPSA updated 17 files
+13 −0 src/psa_aead.c
+44 −40 src/psa_asymmetric_api.c
+26 −4 src/psa_chacha20_poly1305.c
+46 −23 src/psa_cipher.c
+22 −0 src/psa_ecc.c
+66 −66 src/psa_ed25519_ed448.c
+22 −7 src/psa_hash_engine.c
+63 −14 src/psa_key_derivation.c
+136 −26 src/psa_key_storage.c
+35 −0 src/psa_lms_xmss.c
+35 −10 src/psa_mac.c
+15 −0 src/psa_mldsa.c
+37 −0 src/psa_rsa.c
+17 −0 src/psa_size.h
+22 −0 src/psa_tls_prf.c
+767 −1 test/psa_server/psa_api_test.c
+6 −0 user_settings.h
2 changes: 1 addition & 1 deletion lib/wolfTPM
Open in desktop
Submodule wolfTPM updated 5 files
+3 −3 examples/run_examples.sh
+2 −1 src/tpm2.c
+12 −3 src/tpm2_asn.c
+16 −1 src/tpm2_cryptocb.c
+15 −13 src/tpm2_wrap.c
2 changes: 1 addition & 1 deletion lib/wolfssl
Open in desktop
Submodule wolfssl updated 300 files
7 changes: 4 additions & 3 deletions src/xmalloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,10 @@ struct xmalloc_slot {
#define MP_CURVE_FIELD_COUNT_SIZE (380)
#ifndef _LP64
#define ECC_POINT_SIZE (232)
#define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6)
#else
#define ECC_POINT_SIZE (320)
#define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 5)
#define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6)
#endif
#define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 6)
#define MP_DIGIT_BUFFER_MONT_SIZE (sizeof(fp_digit)*(FP_SIZE + 1))
Expand All @@ -187,7 +188,7 @@ struct xmalloc_slot {
#else
#define ECC_POINT_SIZE (512)
#endif
#define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 5)
#define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 6)
#define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6)
#define MP_DIGIT_BUFFER_MONT_SIZE (sizeof(fp_digit)*(FP_SIZE + 1))
#endif
Expand All @@ -200,7 +201,7 @@ struct xmalloc_slot {
#else
#define ECC_POINT_SIZE (608)
#endif
#define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 5)
#define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 6)
#define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6)
#define MP_DIGIT_BUFFER_MONT_SIZE (sizeof(fp_digit)*(FP_SIZE + 1))
#endif
Expand Down
9 changes: 7 additions & 2 deletions test-app/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,10 @@ ifeq ($(HASH),SHA3_384)
CFLAGS+=-D"WOLFBOOT_HASH_SHA3_384"
endif


STACK_USAGE_LIMIT:=1024
ifeq ($(TARGET),sim)
STACK_USAGE_LIMIT:=4608
Comment thread
danielinux marked this conversation as resolved.
endif

ifeq ($(TARGET),ti_hercules)
APP_OBJS:=app_$(TARGET).o ../test-app/libwolfboot.o
Expand All @@ -63,7 +66,7 @@ else
# Stack usage computation not supported on TriCore
ifneq ($(ARCH),AURIX_TC3)
ifneq ($(USE_CLANG),1)
CFLAGS+=-Wstack-usage=1024
CFLAGS+=-Wstack-usage=$(STACK_USAGE_LIMIT)
Comment thread
danielinux marked this conversation as resolved.
endif
endif
CFLAGS+=-DTARGET_$(TARGET) -I../include
Expand Down Expand Up @@ -509,6 +512,8 @@ ifeq ($(TARGET),sim)
# LD on MacOS does not support "-Map="
LDMAPSUPPORTED=$(shell $(CC) -Wl,-Map=image.map 2>&1 | grep 'unknown option')
LDFLAGS=
CFLAGS+=-fno-pie
LDFLAGS+=-no-pie
Comment thread
danielinux marked this conversation as resolved.
ifeq ($(FORCE_32BIT),1)
LDFLAGS+=-m32
CFLAGS+=-m32
Expand Down
13 changes: 7 additions & 6 deletions tools/keytools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# wolfBoot KeyGen and Signing Tool

-include ../../.config

V?=0
ifeq ($(V),0)
Q=@
Expand All @@ -18,6 +16,7 @@ LD = gcc
WOLFBOOTDIR = ../..
CFLAGS = -Wall -Wextra -Werror
CFLAGS += -I. -DWOLFSSL_USER_SETTINGS -I$(WOLFBOOT_LIB_WOLFSSL) -I$(WOLFBOOTDIR)/include
DEPFLAGS = -MMD -MP
Comment thread
danielinux marked this conversation as resolved.
LDFLAGS =
OBJDIR = ./
LIBS =
Expand Down Expand Up @@ -112,6 +111,7 @@ OBJS_REAL+=\
OBJS_REAL+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/dilithium.o

OBJS_VIRT=$(addprefix $(OBJDIR), $(notdir $(OBJS_REAL)))
DEPS=$(OBJS_VIRT:.o=.d) sign.d keygen.d
Comment thread
danielinux marked this conversation as resolved.
vpath %.c $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/
vpath %.c $(WOLFBOOTDIR)/src/
vpath %.c ./
Expand All @@ -125,11 +125,11 @@ debug: all

# build objects
$(OBJDIR)/%.o: %.c
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
$(Q)$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $<
$(OBJDIR)/%.o: $(WOLFBOOTDIR)/src/%.c
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
$(Q)$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $<
$(OBJDIR)/%.o: $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/%.c
$(Q)$(CC) $(CFLAGS) -c -o $@ $<
$(Q)$(CC) $(CFLAGS) $(DEPFLAGS) -c -o $@ $<
Comment thread
danielinux marked this conversation as resolved.

# build templates
sign: $(OBJS_VIRT) $(LIBS) sign.o
Expand All @@ -141,5 +141,6 @@ keygen: $(OBJS_VIRT) $(LIBS) keygen.o
$(Q)$(LD) -o $@ $@.o $(OBJS_VIRT) $(LIBS) $(LDFLAGS)

clean:
rm -f sign keygen *.o
rm -f sign keygen *.o *.d

-include $(DEPS)
Comment thread
danielinux marked this conversation as resolved.
Loading