Skip to content

Commit 88a4bff

Browse files
committed
Multi-test report fixes
1 parent 593fc72 commit 88a4bff

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

.wolfssl_known_macro_extras

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,7 +731,6 @@ WOLFSSL_DILITHIUM_SIGN_SMALL_MEM_PRECALC_A
731731
WOLFSSL_DILITHIUM_SMALL_MEM_POLY64
732732
WOLFSSL_DISABLE_EARLY_SANITY_CHECKS
733733
WOLFSSL_DRBG_SHA256
734-
WOLFSSL_DRBG_SHA512
735734
WOLFSSL_DTLS_DISALLOW_FUTURE
736735
WOLFSSL_DTLS_RECORDS_CAN_SPAN_DATAGRAMS
737736
WOLFSSL_DTLS_RESEND_ONLY_TIMEOUT

configure.ac

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4439,14 +4439,14 @@ then
44394439
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SHA512"
44404440
fi
44414441

4442-
# SHA-256 Hash DRBG (SP 800-90A) sub-option of hashdrbg
4442+
# SHA-256 Hash DRBG (SP 800-90A) -- sub-option of hashdrbg
44434443
AC_ARG_ENABLE([sha256-drbg],
44444444
[AS_HELP_STRING([--enable-sha256-drbg],[Enable SHA-256 Hash DRBG (default: enabled)])],
44454445
[ ENABLED_SHA256_DRBG=$enableval ],
44464446
[ ENABLED_SHA256_DRBG=yes ]
44474447
)
44484448

4449-
# SHA-512 Hash DRBG (SP 800-90A) sub-option of hashdrbg
4449+
# SHA-512 Hash DRBG (SP 800-90A) -- sub-option of hashdrbg
44504450
AC_ARG_ENABLE([sha512-drbg],
44514451
[AS_HELP_STRING([--enable-sha512-drbg],[Enable SHA-512 Hash DRBG (default: enabled)])],
44524452
[ ENABLED_SHA512_DRBG=$enableval ],
@@ -6152,12 +6152,12 @@ AS_CASE([$FIPS_VERSION],
61526152
(test "$FIPS_VERSION" != "dev" || test "$enable_lms" != "no")],
61536153
[ENABLED_LMS="yes"])
61546154
6155-
# SHA-256 DRBG cannot be disabled at build time in FIPS mode
6155+
# SHA-256 DRBG -- cannot be disabled at build time in FIPS mode
61566156
AS_IF([test "$enable_sha256_drbg" = "no"],
61576157
[AC_MSG_WARN([Can not disable SHA256-DRBG at build time in FIPS mode, disable at run-time with wc_Sha256Drbg_Disable() or wc_Sha256Drbg_Disable_fips()])])
61586158
ENABLED_SHA256_DRBG="yes"
61596159
6160-
# SHA-512 DRBG cannot be disabled at build time in FIPS mode
6160+
# SHA-512 DRBG -- cannot be disabled at build time in FIPS mode
61616161
AS_IF([test "$enable_sha512_drbg" = "no"],
61626162
[AC_MSG_WARN([Can not disable SHA512-DRBG at build time in FIPS mode, disable it at run-time with wc_Sha512Drbg_Disable() or wc_Sha512Drbg_Disable_fips()])])
61636163
ENABLED_SHA512_DRBG="yes"
@@ -6939,7 +6939,7 @@ then
69396939
AM_CFLAGS="$AM_CFLAGS -DWC_SRTP_KDF -DHAVE_AES_ECB -DWOLFSSL_AES_DIRECT"
69406940
fi
69416941
6942-
# ML-KEM and Dilithium require SHA-3 and SHAKE force them on before flag
6942+
# ML-KEM and Dilithium require SHA-3 and SHAKE -- force them on before flag
69436943
# processing so that the correct -D flags are emitted.
69446944
if test "$ENABLED_MLKEM" != "no" && test "$ENABLED_LIBOQS" = "no"
69456945
then

wolfcrypt/src/random.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,6 @@ static int Hash_DRBG_Uninstantiate(DRBG_internal* drbg)
816816

817817
#define OUTPUT_BLOCK_LEN_SHA512 (WC_SHA512_DIGEST_SIZE) /* 64 bytes */
818818

819-
typedef struct DRBG_SHA512_internal DRBG_SHA512_internal;
820-
821819
/* Hash Derivation Function using SHA-512 */
822820
/* Returns: DRBG_SUCCESS or DRBG_FAILURE */
823821
static int Hash512_df(DRBG_SHA512_internal* drbg, byte* out, word32 outSz,
@@ -1325,7 +1323,7 @@ int wc_RNG_TestSeed(const byte* seed, word32 seedSz)
13251323

13261324
return ret;
13271325
}
1328-
/* Runtime DRBG disable/enable API only available in non-selftest and
1326+
/* Runtime DRBG disable/enable API -- only available in non-selftest and
13291327
* FIPS v7+ builds (older FIPS/selftest random.c doesn't have these) */
13301328
#if !defined(HAVE_SELFTEST) && \
13311329
(!defined(HAVE_FIPS) || FIPS_VERSION3_GE(7,0,0))

0 commit comments

Comments
 (0)