Skip to content

Move wolfSSL_Init() call higher up to fix Segfault on Win #301

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

Open
lealem47 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Move wolfSSL_Init() call higher up to fix Segfault on Win #301

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
41 changes: 18 additions & 23 deletions src/clu_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,46 +134,41 @@ int main(int argc, char** argv)
int flag = 0;
int ret = WOLFCLU_SUCCESS;
int longIndex = 0;
#ifdef HAVE_FIPS
WC_RNG rng;

#ifdef HAVE_FIPS
wolfCrypt_SetCb_fips(myFipsCb);

#ifdef WC_RNG_SEED_CB
wc_SetSeed_Cb(wc_GenerateSeed);
#endif
#endif

ret = wc_InitRng(&rng);

if (ret != 0) {
wolfCLU_LogError("Err %d, update the FIPS hash\n", ret);
return ret;
if (wolfSSL_Init() != WOLFSSL_SUCCESS) {
wolfCLU_LogError("wolfSSL initialization failed!");
#ifdef HAVE_FIPS
if (wolfCrypt_GetStatus_fips() == IN_CORE_FIPS_E) {
wolfCLU_LogError("Err %d, update the FIPS hash\n", IN_CORE_FIPS_E);
WOLFCLU_LOG(WOLFCLU_L0, "Linked to a FIPS version of wolfSSL that "
"has failed the in core integrity check.");
WOLFCLU_LOG(WOLFCLU_L0, "ALL FIPS crypto will report ERRORS when "
"used.");
WOLFCLU_LOG(WOLFCLU_L0, "To resolve please recompile wolfSSL with "
"the correct integrity hash.");
WOLFCLU_LOG(WOLFCLU_L0, "If the issue continues, contact "
"fips @ wolfssl.com");
}
#endif
return -1;
}

wc_FreeRng(&rng);
#endif

if (argc == 1) {
WOLFCLU_LOG(WOLFCLU_L0, "Main Help.");
wolfCLU_help();
}

#ifdef HAVE_FIPS
if (wolfCrypt_GetStatus_fips() == IN_CORE_FIPS_E) {
WOLFCLU_LOG(WOLFCLU_L0, "Linked to a FIPS version of wolfSSL that has failed the in core"
"integrity check. ALL FIPS crypto will report ERRORS when used."
"To resolve please recompile wolfSSL with the correct integrity"
"hash. If the issue continues, contact fips @ wolfssl.com");
}
#endif

#ifdef DEBUG_WOLFSSL
wolfSSL_Debugging_ON();
#endif
if (wolfSSL_Init() != WOLFSSL_SUCCESS) {
wolfCLU_LogError("wolfSSL initialization failed!");
return -1;
}

optind = 0;

Expand Down
1 change: 1 addition & 0 deletions wolfclu/clu_header_main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ extern "C" {
#include <windows.h>
#include <sys/timeb.h>
#include <io.h>
#include <stdint.h>
#else
#include <unistd.h>
#include <sys/time.h>
Expand Down
Loading