From 2989ec9628a32280538b6a1c6a8d34baaf3611ea Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Thu, 2 Jan 2025 15:02:11 +0100 Subject: [PATCH 1/6] Updated submodules to wolfSSL 5.7.6 --- lib/wolfPKCS11 | 2 +- lib/wolfTPM | 2 +- lib/wolfssl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/wolfPKCS11 b/lib/wolfPKCS11 index a1ddeba8a..b96cdfb97 160000 --- a/lib/wolfPKCS11 +++ b/lib/wolfPKCS11 @@ -1 +1 @@ -Subproject commit a1ddeba8ae03eb5d177dc17b0300af27c6cdb693 +Subproject commit b96cdfb97c0476743517c2f3d01c1aca401261b6 diff --git a/lib/wolfTPM b/lib/wolfTPM index a5f6c912a..80da56728 160000 --- a/lib/wolfTPM +++ b/lib/wolfTPM @@ -1 +1 @@ -Subproject commit a5f6c912ac6903872d9666238440a76bc9f92517 +Subproject commit 80da56728c59e39e40ccfcd1fc43e9a7f1d59185 diff --git a/lib/wolfssl b/lib/wolfssl index 1bfbdb6c7..239b85c80 160000 --- a/lib/wolfssl +++ b/lib/wolfssl @@ -1 +1 @@ -Subproject commit 1bfbdb6c7f5976d4242279c3cd166f1a8e0f965f +Subproject commit 239b85c80438bf60d9a5b9e0ebe9ff097a760d0d From fe9eddbd671a4636898f64d81db98d759f361fd1 Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Thu, 2 Jan 2025 23:37:34 +0100 Subject: [PATCH 2/6] wolfPKCS11: include PR 41 --- lib/wolfHSM | 2 +- lib/wolfPKCS11 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/wolfHSM b/lib/wolfHSM index ea3e9579b..6ce59d6da 160000 --- a/lib/wolfHSM +++ b/lib/wolfHSM @@ -1 +1 @@ -Subproject commit ea3e9579b94a1ddf2b5fb8d8482cb9a80a3a7ebd +Subproject commit 6ce59d6da341eed9ad41ae383b8246121dc788a8 diff --git a/lib/wolfPKCS11 b/lib/wolfPKCS11 index b96cdfb97..6bee70120 160000 --- a/lib/wolfPKCS11 +++ b/lib/wolfPKCS11 @@ -1 +1 @@ -Subproject commit b96cdfb97c0476743517c2f3d01c1aca401261b6 +Subproject commit 6bee701204ea2721b8a82e29e6cddfe27a1d0c37 From 58ca84cea89cf4a2a036b874ca9e3fb5dc60bdcd Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Fri, 3 Jan 2025 00:02:33 +0100 Subject: [PATCH 3/6] Include wolfPKCS11 PR42 --- lib/wolfPKCS11 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wolfPKCS11 b/lib/wolfPKCS11 index 6bee70120..7808688fd 160000 --- a/lib/wolfPKCS11 +++ b/lib/wolfPKCS11 @@ -1 +1 @@ -Subproject commit 6bee701204ea2721b8a82e29e6cddfe27a1d0c37 +Subproject commit 7808688fdeb05150496a10ae6c4de4f797b9d6b0 From d9b93881884ff7f9d4343e12af1eb6b57b70e827 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 2 Jan 2025 15:16:11 -0800 Subject: [PATCH 4/6] Fix for new armasm support of cpuid. --- arch.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch.mk b/arch.mk index fc9d80e54..37d14ab23 100644 --- a/arch.mk +++ b/arch.mk @@ -101,7 +101,8 @@ ifeq ($(ARCH),AARCH64) ifeq ($(NO_ARM_ASM),0) ARCH_FLAGS=-mstrict-align CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8 - WOLFCRYPT_OBJS += lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \ + WOLFCRYPT_OBJS += lib/wolfssl/wolfcrypt/src/cpuid.o \ + lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \ lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \ lib/wolfssl/wolfcrypt/src/port/arm/armv8-aes.o \ lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512-asm_c.o \ From a171090a08e2dd518dffbd099c13ae0e637b73ba Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Fri, 3 Jan 2025 00:18:03 +0100 Subject: [PATCH 5/6] Update wolfTPM --- lib/wolfTPM | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/wolfTPM b/lib/wolfTPM index 80da56728..6e1205b1e 160000 --- a/lib/wolfTPM +++ b/lib/wolfTPM @@ -1 +1 @@ -Subproject commit 80da56728c59e39e40ccfcd1fc43e9a7f1d59185 +Subproject commit 6e1205b1e11e600c31e4a14764331e33def7beb4 From 1468a9204eb18d1826bf3b26b387612910b755fa Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 2 Jan 2025 16:03:07 -0800 Subject: [PATCH 6/6] Force `WOLFSSL_AARCH64_PRIVILEGE_MODE` for AARCH64 to resolve cpuid.c issues. --- arch.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch.mk b/arch.mk index 37d14ab23..dad435544 100644 --- a/arch.mk +++ b/arch.mk @@ -100,7 +100,7 @@ ifeq ($(ARCH),AARCH64) endif ifeq ($(NO_ARM_ASM),0) ARCH_FLAGS=-mstrict-align - CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8 + CFLAGS+=$(ARCH_FLAGS) -DWOLFSSL_ARMASM -DWOLFSSL_ARMASM_INLINE -DWC_HASH_DATA_ALIGNMENT=8 -DWOLFSSL_AARCH64_PRIVILEGE_MODE WOLFCRYPT_OBJS += lib/wolfssl/wolfcrypt/src/cpuid.o \ lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha256.o \ lib/wolfssl/wolfcrypt/src/port/arm/armv8-sha512.o \