Skip to content

Commit f376512

Browse files
dgarskedgarske
authored
Merge pull request #9332 from douzzer/20251022-FIPS-armasm-autotools-fixup
20251022-FIPS-armasm-autotools-fixup
2 parents 4daab8a + 3bd5a30 commit f376512

8 files changed

Lines changed: 148 additions & 33 deletions

File tree

‎.wolfssl_known_macro_extras‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -917,9 +917,7 @@ WOLFSSL_XMSS_LARGE_SECRET_KEY
917917
WOLFSSL_ZEPHYR
918918
WOLF_ALLOW_BUILTIN
919919
WOLF_CRYPTO_CB_CMD
920-
WOLF_CRYPTO_CB_COPY
921920
WOLF_CRYPTO_CB_FIND
922-
WOLF_CRYPTO_CB_FREE
923921
WOLF_CRYPTO_CB_ONLY_ECC
924922
WOLF_CRYPTO_CB_ONLY_RSA
925923
WOLF_CRYPTO_DEV

‎configure.ac‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10968,7 +10968,19 @@ AM_CONDITIONAL([BUILD_FIPS_V1],[test "$HAVE_FIPS_VERSION" = 1])
1096810968
AM_CONDITIONAL([BUILD_FIPS_V2],[test "$HAVE_FIPS_VERSION" = 2 && test "$HAVE_FIPS_VERSION_MINOR" = 0])
1096910969
AM_CONDITIONAL([BUILD_FIPS_RAND],[test "$HAVE_FIPS_VERSION" = 2 && test "$HAVE_FIPS_VERSION_MINOR" = 1])
1097010970
AM_CONDITIONAL([BUILD_FIPS_V5],[test "$HAVE_FIPS_VERSION" = 5])
10971-
AM_CONDITIONAL([BUILD_FIPS_V6],[test $HAVE_FIPS_VERSION -ge 6])
10971+
AM_CONDITIONAL([BUILD_FIPS_V5_PLUS],[test "$HAVE_FIPS_VERSION" -ge 5])
10972+
AM_CONDITIONAL([BUILD_FIPS_V6],[test $HAVE_FIPS_VERSION = 6])
10973+
AM_CONDITIONAL([BUILD_FIPS_V6_PLUS],[test $HAVE_FIPS_VERSION -ge 6])
10974+
10975+
if test "$HAVE_FIPS_VERSION" = 5 || test $HAVE_FIPS_VERSION = 6
10976+
then
10977+
ARMASM_DIST_SOURCES='wolfcrypt/src/port/arm/armv8-aes.c wolfcrypt/src/port/arm/armv8-sha256.c wolfcrypt/src/port/arm/armv8-sha512.c'
10978+
else
10979+
ARMASM_DIST_SOURCES='wolfcrypt/src/port/arm/armv8-aes-asm_c.c wolfcrypt/src/port/arm/armv8-aes-asm.S wolfcrypt/src/port/arm/armv8-sha256-asm_c.c wolfcrypt/src/port/arm/armv8-sha256-asm.S'
10980+
fi
10981+
10982+
AC_SUBST([ARMASM_DIST_SOURCES])
10983+
1097210984
AM_CONDITIONAL([BUILD_FIPS_CURRENT],[test "$HAVE_FIPS_VERSION" -ge 2 ])
1097310985
# BUILD_FIPS_CURRENT is for builds after cert 2425.
1097410986
AM_CONDITIONAL([BUILD_SIPHASH],[test "x$ENABLED_SIPHASH" = "xyes" || test "x$ENABLED_USERSETTINGS" = "xyes"])

‎src/include.am‎

Lines changed: 122 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,34 @@ src_libwolfssl@LIBSUFFIX@_la_LIBADD = $(LIBM) $(LIB_ADD) $(LIB_STATIC_ADD)
4040
src_libwolfssl@LIBSUFFIX@_la_CFLAGS = -DBUILDING_WOLFSSL $(AM_CFLAGS) -DLIBWOLFSSL_GLOBAL_EXTRA_CFLAGS="\" $(EXTRA_CFLAGS)\""
4141
src_libwolfssl@LIBSUFFIX@_la_CPPFLAGS = -DBUILDING_WOLFSSL $(AM_CPPFLAGS)
4242

43+
if BUILD_FIPS_V5
44+
LEGACY_ARMASM_AES_C := wolfcrypt/src/port/arm/armv8-aes.c
45+
LEGACY_ARMASM_SHA256_C := wolfcrypt/src/port/arm/armv8-sha256.c
46+
LEGACY_ARMASM_SHA512_C := wolfcrypt/src/port/arm/armv8-sha512.c
47+
NEW_ARMASM_AES_ASM_C :=
48+
NEW_ARMASM_AES_ASM_S :=
49+
NEW_ARMASM_SHA256_ASM_C :=
50+
NEW_ARMASM_SHA256_ASM_S :=
51+
else
52+
if BUILD_FIPS_V6
53+
LEGACY_ARMASM_AES_C := wolfcrypt/src/port/arm/armv8-aes.c
54+
LEGACY_ARMASM_SHA256_C := wolfcrypt/src/port/arm/armv8-sha256.c
55+
LEGACY_ARMASM_SHA512_C := wolfcrypt/src/port/arm/armv8-sha512.c
56+
NEW_ARMASM_AES_ASM_C :=
57+
NEW_ARMASM_AES_ASM_S :=
58+
NEW_ARMASM_SHA256_ASM_C :=
59+
NEW_ARMASM_SHA256_ASM_S :=
60+
else
61+
LEGACY_ARMASM_AES_C :=
62+
LEGACY_ARMASM_SHA256_C :=
63+
LEGACY_ARMASM_SHA512_C :=
64+
NEW_ARMASM_AES_ASM_C := wolfcrypt/src/port/arm/armv8-aes-asm_c.c
65+
NEW_ARMASM_AES_ASM_S := wolfcrypt/src/port/arm/armv8-aes-asm.S
66+
NEW_ARMASM_SHA256_ASM_C := wolfcrypt/src/port/arm/armv8-sha256-asm_c.c
67+
NEW_ARMASM_SHA256_ASM_S := wolfcrypt/src/port/arm/armv8-sha256-asm.S
68+
endif !BUILD_FIPS_V6
69+
endif !BUILD_FIPS_V5
70+
4371
if BUILD_FIPS
4472

4573
if BUILD_FIPS_V2
@@ -164,12 +192,17 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/aes.c
164192
if BUILD_CUDA
165193
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/cuda/aes-cuda.cu
166194
endif BUILD_CUDA
195+
196+
if BUILD_ARMASM
197+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_AES_C)
198+
endif BUILD_ARMASM
199+
167200
if BUILD_ARMASM_NEON
168201
if BUILD_ARMASM_INLINE
169-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm_c.c
202+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_C)
170203
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c
171204
else
172-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm.S
205+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_S)
173206
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm.S
174207
endif !BUILD_ARMASM_INLINE
175208
else
@@ -216,15 +249,17 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha.c
216249
endif
217250

218251
if BUILD_ARMASM_NEON
252+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
219253
if BUILD_ARMASM_INLINE
220-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm_c.c
254+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_C)
221255
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
222256
else
223-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm.S
257+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_S)
224258
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm.S
225259
endif !BUILD_ARMASM_INLINE
226260
else
227261
if BUILD_ARMASM
262+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
228263
if BUILD_ARMASM_INLINE
229264
if BUILD_ARM_NONTHUMB
230265
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
@@ -267,8 +302,15 @@ if BUILD_SHA512
267302
if BUILD_RISCV_ASM
268303
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
269304
else
305+
306+
if !BUILD_FIPS_V5
307+
if !BUILD_FIPS_V6
270308
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
309+
endif !BUILD_FIPS_V6
310+
endif !BUILD_FIPS_V5
311+
271312
if BUILD_ARMASM_NEON
313+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
272314
if BUILD_ARMASM_INLINE
273315
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512-asm_c.c
274316
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -278,6 +320,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-a
278320
endif !BUILD_ARMASM_INLINE
279321
else
280322
if BUILD_ARMASM
323+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
281324
if BUILD_ARMASM_INLINE
282325
if BUILD_ARM_NONTHUMB
283326
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -294,6 +337,15 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/thumb2-sha512-asm
294337
endif
295338
endif !BUILD_ARMASM_INLINE
296339
else
340+
341+
if BUILD_FIPS_V5
342+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
343+
else
344+
if BUILD_FIPS_V6
345+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
346+
endif BUILD_FIPS_V6
347+
endif !BUILD_FIPS_V5
348+
297349
if !BUILD_X86_ASM
298350
if BUILD_INTELASM
299351
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512_asm.S
@@ -355,7 +407,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fips.c \
355407
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
356408
endif BUILD_FIPS_V5
357409

358-
if BUILD_FIPS_V6
410+
if BUILD_FIPS_V6_PLUS
359411
# FIPS 140-3 SRTP-KDF first file
360412
src_libwolfssl@LIBSUFFIX@_la_SOURCES += \
361413
wolfcrypt/src/wolfcrypt_first.c
@@ -376,12 +428,17 @@ endif
376428

377429
if BUILD_AES
378430
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/aes.c
431+
432+
if BUILD_ARMASM
433+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_AES_C)
434+
endif BUILD_ARMASM
435+
379436
if BUILD_ARMASM_NEON
380437
if BUILD_ARMASM_INLINE
381-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm_c.c
438+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_C)
382439
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c
383440
else
384-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm.S
441+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_S)
385442
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm.S
386443
endif !BUILD_ARMASM_INLINE
387444
else
@@ -424,15 +481,17 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha.c
424481
endif
425482

426483
if BUILD_ARMASM_NEON
484+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
427485
if BUILD_ARMASM_INLINE
428-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm_c.c
486+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_C)
429487
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
430488
else
431-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm.S
489+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_S)
432490
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm.S
433491
endif !BUILD_ARMASM_INLINE
434492
else
435493
if BUILD_ARMASM
494+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
436495
if BUILD_ARMASM_INLINE
437496
if BUILD_ARM_NONTHUMB
438497
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
@@ -472,8 +531,15 @@ if BUILD_SHA512
472531
if BUILD_RISCV_ASM
473532
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
474533
else
534+
535+
if !BUILD_FIPS_V5
536+
if !BUILD_FIPS_V6
475537
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
538+
endif !BUILD_FIPS_V6
539+
endif !BUILD_FIPS_V5
540+
476541
if BUILD_ARMASM_NEON
542+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
477543
if BUILD_ARMASM_INLINE
478544
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512-asm_c.c
479545
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -483,6 +549,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-a
483549
endif !BUILD_ARMASM_INLINE
484550
else
485551
if BUILD_ARMASM
552+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
486553
if BUILD_ARMASM_INLINE
487554
if BUILD_ARM_NONTHUMB
488555
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -499,6 +566,15 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/thumb2-sha512-asm
499566
endif
500567
endif !BUILD_ARMASM_INLINE
501568
else
569+
570+
if BUILD_FIPS_V5
571+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
572+
else
573+
if BUILD_FIPS_V6
574+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
575+
endif BUILD_FIPS_V6
576+
endif !BUILD_FIPS_V5
577+
502578
if BUILD_INTELASM
503579
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512_asm.S
504580
endif BUILD_INTELASM
@@ -642,7 +718,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fips.c \
642718

643719
# fips last file
644720
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wolfcrypt_last.c
645-
endif BUILD_FIPS_V6
721+
endif BUILD_FIPS_V6_PLUS
646722

647723

648724
endif BUILD_FIPS
@@ -676,11 +752,11 @@ endif !BUILD_DO178
676752
if !BUILD_FIPS_RAND
677753

678754
if !BUILD_FIPS_V5
679-
if !BUILD_FIPS_V6
755+
if !BUILD_FIPS_V6_PLUS
680756
if BUILD_KDF
681757
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/kdf.c
682758
endif
683-
endif !BUILD_FIPS_V6
759+
endif !BUILD_FIPS_V6_PLUS
684760
endif !BUILD_FIPS_V5
685761

686762
if !BUILD_FIPS_CURRENT
@@ -692,15 +768,17 @@ endif !BUILD_FIPS_CURRENT
692768
if !BUILD_FIPS_CURRENT
693769
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha256.c
694770
if BUILD_ARMASM_NEON
771+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
695772
if BUILD_ARMASM_INLINE
696-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm_c.c
773+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_C)
697774
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
698775
else
699-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha256-asm.S
776+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_SHA256_ASM_S)
700777
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm.S
701778
endif !BUILD_ARMASM_INLINE
702779
else
703780
if BUILD_ARMASM
781+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA256_C)
704782
if BUILD_ARMASM_INLINE
705783
if BUILD_ARM_NONTHUMB
706784
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha256-asm_c.c
@@ -812,18 +890,23 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/aes.c
812890
if BUILD_CUDA
813891
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/cuda/aes-cuda.cu
814892
endif BUILD_CUDA
893+
894+
if BUILD_ARMASM
895+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_AES_C)
896+
endif BUILD_ARMASM
897+
815898
if BUILD_ARMASM_NEON
816899
if BUILD_ARMASM_INLINE
817900
if BUILD_ARM_NONTHUMB
818-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm_c.c
901+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_C)
819902
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm_c.c
820903
endif
821904
if BUILD_ARM_THUMB
822905
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/thumb2-aes-asm_c.c
823906
endif
824907
else
825908
if BUILD_ARM_NONTHUMB
826-
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-aes-asm.S
909+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(NEW_ARMASM_AES_ASM_S)
827910
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-aes-asm.S
828911
endif
829912
if BUILD_ARM_THUMB
@@ -883,8 +966,15 @@ if BUILD_SHA512
883966
if BUILD_RISCV_ASM
884967
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/riscv/riscv-64-sha512.c
885968
else
969+
970+
if !BUILD_FIPS_V5
971+
if !BUILD_FIPS_V6
886972
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
973+
endif !BUILD_FIPS_V6
974+
endif !BUILD_FIPS_V5
975+
887976
if BUILD_ARMASM_NEON
977+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
888978
if BUILD_ARMASM_INLINE
889979
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-sha512-asm_c.c
890980
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -894,6 +984,7 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-a
894984
endif !BUILD_ARMASM_INLINE
895985
else
896986
if BUILD_ARMASM
987+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += $(LEGACY_ARMASM_SHA512_C)
897988
if BUILD_ARMASM_INLINE
898989
if BUILD_ARM_NONTHUMB
899990
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/armv8-32-sha512-asm_c.c
@@ -910,6 +1001,15 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/port/arm/thumb2-sha512-asm
9101001
endif
9111002
endif !BUILD_ARMASM_INLINE
9121003
else
1004+
1005+
if BUILD_FIPS_V5
1006+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
1007+
else
1008+
if BUILD_FIPS_V6
1009+
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512.c
1010+
endif BUILD_FIPS_V6
1011+
endif !BUILD_FIPS_V5
1012+
9131013
if !BUILD_X86_ASM
9141014
if BUILD_INTELASM
9151015
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/sha512_asm.S
@@ -1104,11 +1204,11 @@ if BUILD_MD5
11041204
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/md5.c
11051205
endif
11061206

1107-
if !BUILD_FIPS_V6
1207+
if !BUILD_FIPS_V6_PLUS
11081208
if BUILD_PWDBASED
11091209
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/pwdbased.c
11101210
endif BUILD_PWDBASED
1111-
endif !BUILD_FIPS_V6
1211+
endif !BUILD_FIPS_V6_PLUS
11121212

11131213
if BUILD_PKCS12
11141214
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/pkcs12.c
@@ -1270,15 +1370,15 @@ src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wc_xmss.c
12701370
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/wc_xmss_impl.c
12711371
endif
12721372

1273-
if !BUILD_FIPS_V6
1373+
if !BUILD_FIPS_V6_PLUS
12741374
if BUILD_CURVE25519
12751375
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/curve25519.c
12761376
endif
12771377

12781378
if BUILD_ED25519
12791379
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/ed25519.c
12801380
endif
1281-
endif !BUILD_FIPS_V6
1381+
endif !BUILD_FIPS_V6_PLUS
12821382

12831383
if BUILD_FEMATH
12841384
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fe_low_mem.c
@@ -1381,15 +1481,15 @@ endif !BUILD_CURVE25519_INTELASM
13811481
endif !BUILD_FEMATH
13821482
endif BUILD_GEMATH
13831483

1384-
if !BUILD_FIPS_V6
1484+
if !BUILD_FIPS_V6_PLUS
13851485
if BUILD_CURVE448
13861486
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/curve448.c
13871487
endif
13881488

13891489
if BUILD_ED448
13901490
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/ed448.c
13911491
endif
1392-
endif !BUILD_FIPS_V6
1492+
endif !BUILD_FIPS_V6_PLUS
13931493

13941494
if BUILD_FE448
13951495
src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fe_448.c

0 commit comments

Comments
 (0)