Skip to content

Commit f660299

Browse files
kaleb-himeskaleb-himes
authored
Merge pull request #7856 from douzzer/20240809-fips-dev-feature-unlock
20240809-fips-dev-feature-unlock
2 parents 85bab19 + 98f8ab0 commit f660299

1 file changed

Lines changed: 102 additions & 50 deletions

File tree

‎configure.ac‎

Lines changed: 102 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -5239,104 +5239,136 @@ AS_CASE([$FIPS_VERSION],
52395239
# optimizations section
52405240
52415241
# protocol section
5242-
AS_IF([test "$ENABLED_WOLFSSH" != "yes" && (test "$FIPS_VERSION" != "dev" || test "$enable_ssh" != "no")],
5242+
AS_IF([test "$ENABLED_WOLFSSH" != "yes" &&
5243+
(test "$FIPS_VERSION" != "dev" || test "$enable_ssh" != "no")],
52435244
[enable_ssh="yes"])
52445245
5245-
AS_IF([test "$ENABLED_HKDF" != "yes"],
5246+
AS_IF([test "$ENABLED_HKDF" != "yes" &&
5247+
(test "$FIPS_VERSION" != "dev" || test "$enable_hkdf" != "no")],
52465248
[ENABLED_HKDF="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_HKDF"])
52475249
5248-
AS_IF([test "x$ENABLED_PWDBASED" = "xno"],
5250+
AS_IF([test "x$ENABLED_PWDBASED" = "xno" &&
5251+
(test "$FIPS_VERSION" != "dev" || test "$enable_pwdbased" != "no")],
52495252
[ENABLED_PWDBASED="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_PBKDF2 -DHAVE_AESGCM"])
52505253
5251-
AS_IF([test "x$ENABLED_SRTP" = "xno"],
5254+
AS_IF([test "x$ENABLED_SRTP" = "xno" &&
5255+
(test "$FIPS_VERSION" != "dev" || test "$enable_srtp" != "no")],
52525256
[ENABLED_SRTP="yes"])
5253-
AS_IF([test "x$ENABLED_SRTP_KDF" = "xno"],
5257+
AS_IF([test "x$ENABLED_SRTP_KDF" = "xno" &&
5258+
(test "$FIPS_VERSION" != "dev" || test "$enable_srtp_kdf" != "no")],
52545259
[ENABLED_SRTP_KDF="yes"])
52555260
52565261
# public key section
5257-
AS_IF([test "$ENABLED_KEYGEN" != "yes" && (test "$FIPS_VERSION" != "dev" || test "$enable_keygen" != "no")],
5262+
AS_IF([test "$ENABLED_KEYGEN" != "yes" &&
5263+
(test "$FIPS_VERSION" != "dev" || test "$enable_keygen" != "no")],
52585264
[ENABLED_KEYGEN="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"])
52595265
5260-
# AS_IF([test "$ENABLED_COMPKEY" = "yes" && (test "$FIPS_VERSION" != "dev" || test "$enable_compkey" != "yes")],
5266+
# AS_IF([test "$ENABLED_COMPKEY" = "yes" &&
5267+
# (test "$FIPS_VERSION" != "dev" || test "$enable_compkey" != "yes")],
52615268
# [ENABLED_COMPKEY="yes"])
52625269
5263-
AS_IF([test "$ENABLED_RSAPSS" != "yes"],
5270+
AS_IF([test "$ENABLED_RSAPSS" != "yes" &&
5271+
(test "$FIPS_VERSION" != "dev" || test "$enable_rsapss" != "no")],
52645272
[ENABLED_RSAPSS="yes"; AM_CFLAGS="$AM_CFLAGS -DWC_RSA_PSS"])
52655273
5266-
AS_IF([test "$ENABLED_ECC" != "yes"],
5274+
AS_IF([test "$ENABLED_ECC" != "yes" &&
5275+
(test "$FIPS_VERSION" != "dev" || test "$enable_ecc" != "no")],
52675276
[ENABLED_ECC="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
52685277
AS_IF([test "$ENABLED_ECC_SHAMIR" = "yes"],
52695278
[AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"])])
52705279
5271-
AS_IF([test "x$ENABLED_ED25519" != "xyes"],
5280+
AS_IF([test "x$ENABLED_ED25519" != "xyes" &&
5281+
(test "$FIPS_VERSION" != "dev" || test "$enable_ed25519" != "no")],
52725282
[ENABLED_ED25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED25519 -DHAVE_ED25519_KEY_IMPORT"])
5273-
AS_IF([test "$ENABLED_CURVE25519" = "no"],
5283+
AS_IF([test "$ENABLED_CURVE25519" = "no" &&
5284+
(test "$FIPS_VERSION" != "dev" || test "$enable_curve25519" != "no")],
52745285
[ENABLED_CURVE25519="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE25519"])
52755286
5276-
AS_IF([test "x$ENABLED_ED448" != "xyes"],
5287+
AS_IF([test "x$ENABLED_ED448" != "xyes" &&
5288+
(test "$FIPS_VERSION" != "dev" || test "$enable_ed448" != "no")],
52775289
[ENABLED_ED448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ED448 -DHAVE_ED448_KEY_IMPORT"])
5278-
AS_IF([test "x$ENABLED_CURVE448" != "xyes"],
5290+
AS_IF([test "x$ENABLED_CURVE448" != "xyes" &&
5291+
(test "$FIPS_VERSION" != "dev" || test "$enable_curve448" != "no")],
52795292
[ENABLED_CURVE448="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_CURVE448"])
52805293
5281-
AS_IF([test "x$ENABLED_ED25519_STREAM" != "xyes"],
5294+
AS_IF([test "x$ENABLED_ED25519_STREAM" != "xyes" &&
5295+
(test "$FIPS_VERSION" != "dev" || test "$enable_ed25519_stream" != "no")],
52825296
[ENABLED_ED25519_STREAM="yes"])
5283-
AS_IF([test "x$ENABLED_ED448_STREAM" != "xyes"],
5297+
AS_IF([test "x$ENABLED_ED448_STREAM" != "xyes" &&
5298+
(test "$FIPS_VERSION" != "dev" || test "$enable_ed448_stream" != "no")],
52845299
[ENABLED_ED448_STREAM="yes"])
52855300
5286-
AS_IF([test "x$ENABLED_ECCCUSTCURVES" != "xno" && test "$FIPS_VERSION" != "dev"],
5301+
AS_IF([test "x$ENABLED_ECCCUSTCURVES" != "xno" &&
5302+
test "$FIPS_VERSION" != "dev"],
52875303
[ENABLED_ECCCUSTCURVES="no"])
52885304
52895305
# Hashing section
5290-
AS_IF([test "x$ENABLED_SHA3" != "xyes"],
5306+
AS_IF([test "x$ENABLED_SHA3" != "xyes" &&
5307+
(test "$FIPS_VERSION" != "dev" || test "$enable_sha3" != "no")],
52915308
[ENABLED_SHA3="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA3"])
52925309
5293-
AS_IF([test "$ENABLED_SHA224" != "yes" && (test "$FIPS_VERSION" != "dev" || test "$enable_sha224" != "no")],
5310+
AS_IF([test "$ENABLED_SHA224" != "yes" &&
5311+
(test "$FIPS_VERSION" != "dev" || test "$enable_sha224" != "no")],
52945312
[ENABLED_SHA224="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA224"])
52955313
5296-
AS_IF([test "$ENABLED_SHA512" = "no"],
5314+
AS_IF([test "$ENABLED_SHA512" = "no" &&
5315+
(test "$FIPS_VERSION" != "dev" || test "$enable_sha512" != "no")],
52975316
[ENABLED_SHA512="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA512 -DWOLFSSL_SHA384"])
52985317
52995318
# SHA512-224 and SHA512-256 are SHA-2 algorithms not in our FIPS algorithm list
53005319
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NOSHA512_224 -DWOLFSSL_NOSHA512_256"
53015320
53025321
# Shake128 because we're testing SHAKE256
5303-
AS_IF([test "x$ENABLED_SHAKE128" = "xno"],
5322+
AS_IF([test "x$ENABLED_SHAKE128" = "xno" &&
5323+
(test "$FIPS_VERSION" != "dev" || test "$enable_shake128" != "no")],
53045324
[ENABLED_SHAKE128="yes"])
53055325
53065326
# Shake256 mandated for ED448
5307-
AS_IF([test "x$ENABLED_SHAKE256" = "xno"],
5327+
AS_IF([test "x$ENABLED_SHAKE256" = "xno" &&
5328+
(test "$FIPS_VERSION" != "dev" || test "$enable_shake256" != "no")],
53085329
[ENABLED_SHAKE256="yes"])
53095330
53105331
# Aes section
5311-
AS_IF([test "$ENABLED_AESCCM" != "yes"],
5332+
AS_IF([test "$ENABLED_AESCCM" != "yes" &&
5333+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesccm" != "no")],
53125334
[ENABLED_AESCCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESCCM"])
53135335
5314-
AS_IF([test "$ENABLED_AESCTR" != "yes"],
5336+
AS_IF([test "$ENABLED_AESCTR" != "yes" &&
5337+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesctr" != "no")],
53155338
[ENABLED_AESCTR="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_COUNTER"])
53165339
5317-
AS_IF([test "$ENABLED_CMAC" != "yes"],
5340+
AS_IF([test "$ENABLED_CMAC" != "yes" &&
5341+
(test "$FIPS_VERSION" != "dev" || test "$enable_cmac" != "no")],
53185342
[ENABLED_CMAC="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CMAC"])
53195343
5320-
AS_IF([test "$ENABLED_AESGCM" = "no"],
5344+
AS_IF([test "$ENABLED_AESGCM" = "no" &&
5345+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesgcm" != "no")],
53215346
[ENABLED_AESGCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESGCM"; AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_AESGCM"])
53225347
53235348
# AES-GCM streaming is part of the v6 FIPS suite, but isn't implemented
53245349
# for armasm on arm-v7 or earlier (see armasm setup above).
5325-
AS_IF([test "$ENABLED_AESGCM_STREAM" != "yes" && ! (test "$ENABLED_ARMASM" = "yes" && test "$ENABLED_ARMASM_CRYPTO" = "no")],
5350+
AS_IF([test "$ENABLED_AESGCM_STREAM" != "yes" &&
5351+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesgcm_stream" != "no") &&
5352+
! (test "$ENABLED_ARMASM" = "yes" && test "$ENABLED_ARMASM_CRYPTO" = "no")],
53265353
[ENABLED_AESGCM_STREAM="yes"])
53275354
5328-
AS_IF([test "x$ENABLED_AESOFB" = "xno"],
5355+
AS_IF([test "x$ENABLED_AESOFB" = "xno" &&
5356+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesofb" != "no")],
53295357
[ENABLED_AESOFB="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_OFB"])
53305358
5331-
AS_IF([test "x$ENABLED_AESCFB" = "xno"],
5359+
AS_IF([test "x$ENABLED_AESCFB" = "xno" &&
5360+
(test "$FIPS_VERSION" != "dev" || test "$enable_aescfb" != "no")],
53325361
[ENABLED_AESCFB="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_CFB"])
53335362
5334-
AS_IF([test "x$ENABLED_AESXTS" = "xno"],
5363+
AS_IF([test "x$ENABLED_AESXTS" = "xno" &&
5364+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesxts" != "no")],
53355365
[ENABLED_AESXTS="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_XTS"])
53365366
AS_IF([test "x$ENABLED_AESXTS" = "xyes" && test "x$ENABLED_AESNI" = "xyes"],
53375367
[AM_CCASFLAGS="$AM_CCASFLAGS -DWOLFSSL_AES_XTS"])
53385368
5339-
AS_IF([test "x$ENABLED_AESXTS_STREAM" = "xno" && ! (test "$ENABLED_ARMASM" = "yes" || test "$ENABLED_ARMASM_CRYPTO" = "no")],
5369+
AS_IF([test "x$ENABLED_AESXTS_STREAM" = "xno" &&
5370+
(test "$FIPS_VERSION" != "dev" || test "$enable_aesxts_stream" != "no") &&
5371+
! (test "$ENABLED_ARMASM" = "yes" || test "$ENABLED_ARMASM_CRYPTO" = "no")],
53405372
[ENABLED_AESXTS_STREAM="yes"])
53415373
53425374
AS_IF([(test "$ENABLED_AESCCM" = "yes" && test "$HAVE_AESCCM_PORT" != "yes") ||
@@ -5345,7 +5377,8 @@ AS_CASE([$FIPS_VERSION],
53455377
(test "$ENABLED_AESOFB" = "yes" && test "$HAVE_AESOFB_PORT" != "yes")],
53465378
[AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_DIRECT -DHAVE_AES_ECB"])
53475379
5348-
AS_IF([test "x$ENABLED_AESKEYWRAP" != "xyes"],
5380+
AS_IF([test "x$ENABLED_AESKEYWRAP" != "xyes" &&
5381+
(test "$FIPS_VERSION" != "dev" || test "$enable_aeskeywrap" != "no")],
53495382
[ENABLED_AESKEYWRAP="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AES_KEYWRAP"])
53505383
53515384
# Old TLS requires MD5 + HMAC, which is not allowed under FIPS 140-3
@@ -5388,74 +5421,93 @@ AS_CASE([$FIPS_VERSION],
53885421
53895422
# force various features to FIPS 140-3 defaults, unless overridden with dev:
53905423
5391-
AS_IF([test "$ENABLED_KEYGEN" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_keygen" != "no")],
5424+
AS_IF([test "$ENABLED_KEYGEN" != "yes" &&
5425+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_keygen" != "no")],
53925426
[ENABLED_KEYGEN="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_KEY_GEN"])
53935427
5394-
AS_IF([test "$ENABLED_COMPKEY" = "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_compkey" != "yes")],
5428+
AS_IF([test "$ENABLED_COMPKEY" = "yes" &&
5429+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_compkey" != "yes")],
53955430
[ENABLED_COMPKEY="no"])
53965431
5397-
AS_IF([test "$ENABLED_SHA224" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha224" != "no")],
5432+
AS_IF([test "$ENABLED_SHA224" != "yes" &&
5433+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha224" != "no")],
53985434
[ENABLED_SHA224="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA224"])
53995435
5400-
AS_IF([test "$ENABLED_SHA3" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha3" != "no")],
5436+
AS_IF([test "$ENABLED_SHA3" != "yes" &&
5437+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha3" != "no")],
54015438
[ENABLED_SHA3="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA3"])
54025439
5403-
AS_IF([test "$ENABLED_WOLFSSH" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_ssh" != "no")],
5440+
AS_IF([test "$ENABLED_WOLFSSH" != "yes" &&
5441+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_ssh" != "no")],
54045442
[enable_ssh="yes"])
54055443
54065444
# Shake128 is a SHA-3 algorithm outside the v5 FIPS algorithm list
5407-
AS_IF([test "$ENABLED_SHAKE128" != "no" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_shake128" != "yes")],
5445+
AS_IF([test "$ENABLED_SHAKE128" != "no" &&
5446+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_shake128" != "yes")],
54085447
[ENABLED_SHAKE128=no; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_SHAKE128"])
54095448
54105449
# Shake256 is a SHA-3 algorithm outside the v5 FIPS algorithm list
5411-
AS_IF([test "$ENABLED_SHAKE256" != "no" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_shake256" != "yes")],
5450+
AS_IF([test "$ENABLED_SHAKE256" != "no" &&
5451+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_shake256" != "yes")],
54125452
[ENABLED_SHAKE256=no; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NO_SHAKE256"])
54135453
54145454
# SHA512-224 and SHA512-256 are SHA-2 algorithms outside the v5 FIPS algorithm list
54155455
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_NOSHA512_224 -DWOLFSSL_NOSHA512_256"
54165456
5417-
AS_IF([test "$ENABLED_AESCCM" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesccm" != "no")],
5457+
AS_IF([test "$ENABLED_AESCCM" != "yes" &&
5458+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesccm" != "no")],
54185459
[ENABLED_AESCCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESCCM"])
54195460
5420-
AS_IF([test "$ENABLED_AESXTS" = "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesxts" != "yes")],
5461+
AS_IF([test "$ENABLED_AESXTS" = "yes" &&
5462+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesxts" != "yes")],
54215463
[ENABLED_AESXTS="no"])
54225464
5423-
AS_IF([test "$ENABLED_RSAPSS" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_rsapss" != "no")],
5465+
AS_IF([test "$ENABLED_RSAPSS" != "yes" &&
5466+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_rsapss" != "no")],
54245467
[ENABLED_RSAPSS="yes"; AM_CFLAGS="$AM_CFLAGS -DWC_RSA_PSS"])
54255468
5426-
AS_IF([test "$ENABLED_ECC" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_ecc" != "no")],
5469+
AS_IF([test "$ENABLED_ECC" != "yes" &&
5470+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_ecc" != "no")],
54275471
[ENABLED_ECC="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_ECC -DTFM_ECC256"
5428-
AS_IF([test "$ENABLED_ECC_SHAMIR" = "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_eccshamir" != "no")],
5472+
AS_IF([test "$ENABLED_ECC_SHAMIR" = "yes" &&
5473+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_eccshamir" != "no")],
54295474
[AM_CFLAGS="$AM_CFLAGS -DECC_SHAMIR"])])
54305475
5431-
AS_IF([test "$ENABLED_AESCTR" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesctr" != "no")],
5476+
AS_IF([test "$ENABLED_AESCTR" != "yes" &&
5477+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesctr" != "no")],
54325478
[ENABLED_AESCTR="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_COUNTER"])
54335479
5434-
AS_IF([test "$ENABLED_CMAC" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_cmac" != "no")],
5480+
AS_IF([test "$ENABLED_CMAC" != "yes" &&
5481+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_cmac" != "no")],
54355482
[ENABLED_CMAC="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CMAC"])
54365483
5437-
AS_IF([test "$ENABLED_HKDF" != "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_hkdf" != "no")],
5484+
AS_IF([test "$ENABLED_HKDF" != "yes" &&
5485+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_hkdf" != "no")],
54385486
[ENABLED_HKDF="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_HKDF"])
54395487
54405488
AS_IF([test "$ENABLED_INTELASM" = "yes"],
54415489
[AM_CFLAGS="$AM_CFLAGS -DFORCE_FAILURE_RDSEED"])
54425490
5443-
AS_IF([test "$ENABLED_SHA512" = "no" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha512" != "no")],
5491+
AS_IF([test "$ENABLED_SHA512" = "no" &&
5492+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_sha512" != "no")],
54445493
[ENABLED_SHA512="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA512 -DWOLFSSL_SHA384"])
54455494
5446-
AS_IF([test "$ENABLED_AESGCM" = "no" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesgcm" != "no")],
5495+
AS_IF([test "$ENABLED_AESGCM" = "no" &&
5496+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesgcm" != "no")],
54475497
[ENABLED_AESGCM="yes"; AM_CFLAGS="$AM_CFLAGS -DHAVE_AESGCM"; AM_CCASFLAGS="$AM_CCASFLAGS -DHAVE_AESGCM"])
54485498
54495499
# AES-GCM streaming isn't part of the v5 FIPS suite.
5450-
AS_IF([test "$ENABLED_AESGCM_STREAM" = "yes" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesgcm_stream" != "yes")],
5500+
AS_IF([test "$ENABLED_AESGCM_STREAM" = "yes" &&
5501+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesgcm_stream" != "yes")],
54515502
[ENABLED_AESGCM_STREAM="no"])
54525503
54535504
# Old TLS requires MD5 + HMAC, which is not allowed under FIPS 140-3
54545505
AS_IF([test "$ENABLED_OLD_TLS" != "no"],
54555506
[ENABLED_OLD_TLS="no"; AM_CFLAGS="$AM_CFLAGS -DNO_OLD_TLS"])
54565507
54575508
AS_IF([test $HAVE_FIPS_VERSION_MINOR -ge 2],
5458-
[AS_IF([test "x$ENABLED_AESOFB" = "xno" && (test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesofb" != "no")],
5509+
[AS_IF([test "x$ENABLED_AESOFB" = "xno" &&
5510+
(test "$FIPS_VERSION" != "v5-dev" || test "$enable_aesofb" != "no")],
54595511
[ENABLED_AESOFB="yes"; AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_OFB"])])
54605512
54615513
AS_IF([(test "$ENABLED_AESCCM" = "yes" && test "$HAVE_AESCCM_PORT" != "yes") ||

0 commit comments

Comments
 (0)