Skip to content

Allow building with hashdrbg disabled under fips #9211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Allow building with hashdrbg disabled under fips #9211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/server/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4081,7 +4081,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
wolfSSL_Debugging_ON();
#endif
wolfSSL_Init();
#ifdef WC_RNG_SEED_CB
#if defined(WC_RNG_SEED_CB) && !defined(WC_NO_HASHDRBG)
wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
#endif
ChangeToWolfRoot();
Expand Down
2 changes: 1 addition & 1 deletion src/ssl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6321,7 +6321,7 @@ int wolfSSL_Init(void)
}
#endif

#ifdef WC_RNG_SEED_CB
#if defined(WC_RNG_SEED_CB) && !defined(WC_NO_HASHDRBG)
wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
#endif

Expand Down
2 changes: 2 additions & 0 deletions tests/api/test_random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ int test_wc_RNG_DRBG_Reseed(void)
int test_wc_RNG_TestSeed(void)
{
EXPECT_DECLS;
#ifndef WC_NO_HASHDRBG
#if defined(HAVE_HASHDRBG) && \
!(defined(HAVE_FIPS) || defined(HAVE_SELFTEST)) || \
(defined(HAVE_FIPS_VERSION) && (HAVE_FIPS_VERSION >= 2))
Expand Down Expand Up @@ -351,6 +352,7 @@ int test_wc_RNG_TestSeed(void)
for (i = 0; i < (byte)sizeof(seed); i++)
seed[i] = i;
ExpectIntEQ(wc_RNG_TestSeed(seed, sizeof(seed)), 0);
#endif
#endif
return EXPECT_RESULT();
}
Expand Down
2 changes: 1 addition & 1 deletion tests/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ int unit_test(int argc, char** argv)
wolfSSL_Debugging_ON();
#endif

#ifdef WC_RNG_SEED_CB
#if defined(WC_RNG_SEED_CB) && !defined(WC_NO_HASHDRBG)
wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
#endif
#ifdef HAVE_WNR
Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/benchmark/benchmark.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4073,7 +4073,7 @@ int benchmark_init(void)
}
#endif

#ifdef WC_RNG_SEED_CB
#if defined(WC_RNG_SEED_CB) && !defined(WC_NO_HASHDRBG)
wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
#endif

Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1530,7 +1530,7 @@ wc_test_ret_t wolfcrypt_test(void* args)
heap_baselineBytes = wolfCrypt_heap_peakBytes_checkpoint();
#endif

#ifdef WC_RNG_SEED_CB
#if defined(WC_RNG_SEED_CB) && !defined(WC_NO_HASHDRBG)
wc_SetSeed_Cb(WC_GENERATE_SEED_DEFAULT);
#endif

Expand Down
Loading