Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 10 additions & 6 deletions arch.mk
Original file line number Diff line number Diff line change
Expand Up @@ -963,11 +963,13 @@ ifeq ($(ARCH),RISCV64)
endif

ifneq ($(NO_ASM),1)
CFLAGS+=-DWOLFSSL_RISCV_ASM
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha256.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha512.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha3.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-aes.o
CFLAGS+=-DWOLFSSL_RISCV_ASM -DWOLFSSL_RISCV_ASM_INLINE
WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha256-asm_c.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha512-asm_c.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha3-asm_c.o \
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-aes-asm_c.o
# generated file has unused tables when AES decrypt/GCM are disabled
$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-aes-asm_c.o: CFLAGS+=-Wno-unused-const-variable
endif
endif

Expand Down Expand Up @@ -1007,11 +1009,13 @@ ifeq ($(ARCH),PPC)
endif

ifneq ($(NO_ASM),1)
# Use the SHA256 and SP math all assembly accelerations
# Use the SHA-2 and SP math all assembly accelerations
CFLAGS+=-DWOLFSSL_SP_PPC
CFLAGS+=-DWOLFSSL_PPC32_ASM -DWOLFSSL_PPC32_ASM_INLINE
#CFLAGS+=-DWOLFSSL_PPC32_ASM_SMALL
MATH_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
# builds empty unless SHA-384/512 is enabled
MATH_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha512-asm_c.o
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion lib/wolfHSM
Submodule wolfHSM updated 162 files
2 changes: 1 addition & 1 deletion lib/wolfssl
Submodule wolfssl updated 1314 files
4 changes: 3 additions & 1 deletion test-app/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,10 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
CFLAGS+=-DWOLFSSL_SP_PPC
endif

# SHA256
# SHA-2
APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
# builds empty unless SHA-384/512 is enabled
APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha512-asm_c.o
CFLAGS+=-DWOLFSSL_PPC32_ASM
CFLAGS+=-DWOLFSSL_PPC32_ASM_INLINE
CFLAGS+=-DWOLFSSL_PPC32_ASM_SMALL
Expand Down
8 changes: 4 additions & 4 deletions tools/test.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ test-size-all:
make keysclean
make test-size SIGN=ECC256 LIMIT=18880 NO_ARM_ASM=1
make clean
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13896 NO_ARM_ASM=1
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13924 NO_ARM_ASM=1
make keysclean
make test-size SIGN=RSA2048 LIMIT=11768 NO_ARM_ASM=1
make clean
Expand All @@ -1203,9 +1203,9 @@ test-size-all:
make keysclean
make test-size SIGN=ECC384 LIMIT=19564 NO_ARM_ASM=1
make clean
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15260 NO_ARM_ASM=1
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15284 NO_ARM_ASM=1
make keysclean
make test-size SIGN=ED448 LIMIT=14212 NO_ARM_ASM=1
make test-size SIGN=ED448 LIMIT=14248 NO_ARM_ASM=1
make keysclean
make test-size SIGN=RSA3072 LIMIT=11908 NO_ARM_ASM=1
make clean
Expand All @@ -1232,5 +1232,5 @@ test-size-all:
LIMIT=8728 NO_ARM_ASM=1
make keysclean
make clean
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19486 \
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19582 \
IMAGE_SIGNATURE_SIZE=2420 IMAGE_HEADER_SIZE?=8192