Skip to content

Commit d8797f5

Browse files
douzzerdouzzer
authored
Merge pull request #10261 from Frauschi/slh-dsa
Replace liboqs SPHINCS+ with SLH-DSA in certificate layer
2 parents 8541142 + 9393d62 commit d8797f5

90 files changed

Lines changed: 10749 additions & 2920 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.wolfssl_known_macro_extras‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ HAVE_PKCS7_RSA_RAW_SIGN_CALLBACK
299299
HAVE_POCO_LIB
300300
HAVE_RTP_SYS
301301
HAVE_SECURE_GETENV
302-
HAVE_SPHINCS
303302
HAVE_STACK_SIZE_VERBOSE_LOG
304303
HAVE_THREADX
305304
HAVE_TM_TYPE
@@ -853,7 +852,6 @@ WOLFSSL_NO_SERVER_GROUPS_EXT
853852
WOLFSSL_NO_SESSION_STATS
854853
WOLFSSL_NO_SIGALG
855854
WOLFSSL_NO_SOCKADDR_UN
856-
WOLFSSL_NO_SPHINCS
857855
WOLFSSL_NO_STRICT_CIPHER_SUITE
858856
WOLFSSL_NO_TICKET_EXPIRE
859857
WOLFSSL_NO_TRUSTED_CERTS_VERIFY

‎IDE/Espressif/ESP-IDF/examples/template/components/wolfssl/component.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/siphash.o
244244
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm2.o
245245
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm3.o
246246
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm4.o
247-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sphincs.o
248247
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm32.o
249248
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm64.o
250249
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_armthumb.o
@@ -270,6 +269,7 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_mlkem_poly.o
270269
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_lms.o
271270
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_pkcs11.o
272271
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_port.o
272+
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_slhdsa.o
273273
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_xmss.o
274274
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_first.o # autogen exclusion
275275
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_last.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_benchmark/components/wolfssl/component.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/siphash.o
244244
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm2.o
245245
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm3.o
246246
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm4.o
247-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sphincs.o
248247
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm32.o
249248
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm64.o
250249
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_armthumb.o
@@ -270,6 +269,7 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_mlkem_poly.o
270269
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_lms.o
271270
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_pkcs11.o
272271
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_port.o
272+
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_slhdsa.o
273273
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_xmss.o
274274
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_first.o # autogen exclusion
275275
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_last.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_client/components/wolfssl/component.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/siphash.o
244244
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm2.o
245245
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm3.o
246246
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm4.o
247-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sphincs.o
248247
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm32.o
249248
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm64.o
250249
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_armthumb.o
@@ -270,6 +269,7 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_mlkem_poly.o
270269
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_lms.o
271270
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_pkcs11.o
272271
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_port.o
272+
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_slhdsa.o
273273
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_xmss.o
274274
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_first.o # autogen exclusion
275275
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_last.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_server/components/wolfssl/component.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/siphash.o
244244
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm2.o
245245
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm3.o
246246
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm4.o
247-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sphincs.o
248247
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm32.o
249248
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm64.o
250249
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_armthumb.o
@@ -270,6 +269,7 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_mlkem_poly.o
270269
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_lms.o
271270
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_pkcs11.o
272271
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_port.o
272+
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_slhdsa.o
273273
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_xmss.o
274274
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_first.o # autogen exclusion
275275
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_last.o # autogen exclusion

‎IDE/Espressif/ESP-IDF/examples/wolfssl_test/components/wolfssl/component.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/siphash.o
244244
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm2.o
245245
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm3.o
246246
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sm4.o
247-
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sphincs.o
248247
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm32.o
249248
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_arm64.o
250249
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/sp_armthumb.o
@@ -270,6 +269,7 @@ COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_mlkem_poly.o
270269
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_lms.o
271270
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_pkcs11.o
272271
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_port.o
272+
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_slhdsa.o
273273
COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wc_xmss.o
274274
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_first.o # autogen exclusion
275275
# COMPONENT_OBJS += $(WOLFSSL_ROOT)/wolfcrypt/src/wolfcrypt_last.o # autogen exclusion

‎IDE/INTIME-RTOS/Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
SWENGENV := $(RMX_SRC_BASE)/tools/swenghg
44
#
55
# makefile -- defines the macros, directives and rules necessary to build the
6-
# wolfSSL library.
6+
# wolfSSL library.
77
#
88
# NOTES:
99
# 1. This makefile is a "wrapper" makefile for the Visual Studio 80
10-
# INtime package project. The makefile provides RCS and component
10+
# INtime package project. The makefile provides RCS and component
1111
# release support not provided by the project's native visual Studio
1212
# makefile.
13-
#
13+
#
1414
# 2. The SWENG environment assumes makefile execution from a Windows NT
1515
# environment.
1616
#
@@ -33,7 +33,7 @@ SWENGENV := $(RMX_SRC_BASE)/tools/swenghg
3333
# components.
3434
#
3535
# 6. A SWENG makefile executes standard MKS and MSVC tools. Other tool
36-
# sets require additional macro and rule definition.
36+
# sets require additional macro and rule definition.
3737
#
3838

3939
# Default macros and directives.
@@ -157,11 +157,11 @@ MAKEFILE := makefile
157157
ASM :=
158158
C :=
159159
CPP :=
160-
RCFILE :=
160+
RCFILE :=
161161

162-
SRCS :=
162+
SRCS :=
163163
OBJ :=
164-
CFGS :=
164+
CFGS :=
165165

166166
DEBRIS := $(LOGFILE) release* debug* *.sdf *.user *.aps *.bak *~
167167

@@ -319,7 +319,6 @@ INCL_TARGS := wolfssl/callbacks.h \
319319
wolfssl/wolfcrypt/sm4.h \
320320
wolfssl/wolfcrypt/sp.h \
321321
wolfssl/wolfcrypt/sp_int.h \
322-
wolfssl/wolfcrypt/sphincs.h \
323322
wolfssl/wolfcrypt/srp.h \
324323
wolfssl/wolfcrypt/tfm.h \
325324
wolfssl/wolfcrypt/types.h \
@@ -329,6 +328,7 @@ INCL_TARGS := wolfssl/callbacks.h \
329328
wolfssl/wolfcrypt/wc_lms.h \
330329
wolfssl/wolfcrypt/wc_pkcs11.h \
331330
wolfssl/wolfcrypt/wc_port.h \
331+
wolfssl/wolfcrypt/wc_slhdsa.h \
332332
wolfssl/wolfcrypt/wc_xmss.h \
333333
wolfssl/wolfcrypt/wolfevent.h \
334334
wolfssl/wolfcrypt/wolfmath.h \
@@ -404,7 +404,7 @@ INCL_TARGS := wolfssl/callbacks.h \
404404
#
405405
# NOTES:
406406
# 1. These files must always be included after the macro definitions and
407-
# before the component-specific rules.
407+
# before the component-specific rules.
408408

409409
.INCLUDE:$(SWENGENV)/rules.wnt
410410
.INCLUDE:$(SWENGENV)/intimerules.wnt
@@ -495,7 +495,7 @@ done
495495
# environment variables in a sub-shell before invoking the makefile.
496496
#
497497
# 2. Path vectors are converted to Microsoft-style pathname slashes
498-
# via 'redmond.ksh' before passing them as environment variables to
498+
# via 'redmond.ksh' before passing them as environment variables to
499499
# Microsoft tools.
500500

501501
SOLUTIONFILE = wolfssl-lib.sln

‎IDE/INTIME-RTOS/libwolfssl.vcxproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@
8181
<ClCompile Include="..\..\wolfcrypt\src\sha3.c" />
8282
<ClCompile Include="..\..\wolfcrypt\src\sha512.c" />
8383
<ClCompile Include="..\..\wolfcrypt\src\signature.c" />
84-
<ClCompile Include="..\..\wolfcrypt\src\sphincs.c" />
8584
<ClCompile Include="..\..\wolfcrypt\src\sp_c32.c" />
8685
<ClCompile Include="..\..\wolfcrypt\src\sp_c64.c" />
8786
<ClCompile Include="..\..\wolfcrypt\src\sp_int.c" />
@@ -93,6 +92,7 @@
9392
<ClCompile Include="..\..\wolfcrypt\src\wolfevent.c" />
9493
<ClCompile Include="..\..\wolfcrypt\src\wolfmath.c" />
9594
<ClCompile Include="..\..\wolfcrypt\src\wc_pkcs11.c" />
95+
<ClCompile Include="..\..\wolfcrypt\src\wc_slhdsa.c" />
9696
<ClCompile Include="..\..\wolfcrypt\src\port\liboqs\liboqs.c" />
9797

9898
</ItemGroup>
@@ -164,6 +164,7 @@
164164
<ClInclude Include="..\..\wolfssl\wolfcrypt\visibility.h" />
165165
<ClInclude Include="..\..\wolfssl\wolfcrypt\wc_encrypt.h" />
166166
<ClInclude Include="..\..\wolfssl\wolfcrypt\wc_port.h" />
167+
<ClInclude Include="..\..\wolfssl\wolfcrypt\wc_slhdsa.h" />
167168
<ClInclude Include="..\..\wolfssl\wolfcrypt\wolfevent.h" />
168169
<ClInclude Include="..\..\wolfssl\wolfcrypt\wolfmath.h" />
169170
</ItemGroup>

‎IDE/INTIME-RTOS/wolfssl-lib.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@
106106
<ClCompile Include="..\..\wolfcrypt\src\sm2.c" />
107107
<ClCompile Include="..\..\wolfcrypt\src\sm3.c" />
108108
<ClCompile Include="..\..\wolfcrypt\src\sm4.c" />
109-
<ClCompile Include="..\..\wolfcrypt\src\sphincs.c" />
110109
<ClCompile Include="..\..\wolfcrypt\src\sp_arm32.c" />
111110
<ClCompile Include="..\..\wolfcrypt\src\sp_arm64.c" />
112111
<ClCompile Include="..\..\wolfcrypt\src\sp_armthumb.c" />
@@ -188,6 +187,7 @@
188187
<ClCompile Include="..\..\wolfcrypt\src\tfm.c" />
189188
<ClCompile Include="..\..\wolfcrypt\src\wc_encrypt.c" />
190189
<ClCompile Include="..\..\wolfcrypt\src\wc_port.c" />
190+
<ClCompile Include="..\..\wolfcrypt\src\wc_slhdsa.c" />
191191
<ClCompile Include="..\..\wolfcrypt\src\wolfevent.c" />
192192
<ClCompile Include="..\..\wolfcrypt\src\wolfmath.c" />
193193
</ItemGroup>

‎IDE/MPLABX16/wolfssl.X/nbproject/configurations.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,12 @@
8181
<itemPath>../../../wolfcrypt/src/sp_c32.c</itemPath>
8282
<itemPath>../../../wolfcrypt/src/sp_c64.c</itemPath>
8383
<itemPath>../../../wolfcrypt/src/sp_int.c</itemPath>
84-
<itemPath>../../../wolfcrypt/src/sphincs.c</itemPath>
8584
<itemPath>../../../wolfcrypt/src/srp.c</itemPath>
8685
<itemPath>../../../wolfcrypt/src/tfm.c</itemPath>
8786
<itemPath>../../../wolfcrypt/src/wc_encrypt.c</itemPath>
8887
<itemPath>../../../wolfcrypt/src/wc_pkcs11.c</itemPath>
8988
<itemPath>../../../wolfcrypt/src/wc_port.c</itemPath>
89+
<itemPath>../../../wolfcrypt/src/wc_slhdsa.c</itemPath>
9090
<itemPath>../../../wolfcrypt/src/wolfevent.c</itemPath>
9191
<itemPath>../../../wolfcrypt/src/wolfmath.c</itemPath>
9292
</logicalFolder>

0 commit comments

Comments
 (0)