mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2025-07-30 18:57:27 +02:00
Merge pull request #7294 from douzzer/20240301-wolfSSL_Init-identicalInnerCondition
20240301-wolfSSL_Init-identicalInnerCondition
This commit is contained in:
16
src/ssl.c
16
src/ssl.c
@ -6244,20 +6244,20 @@ int wolfSSL_Init(void)
|
|||||||
return BAD_MUTEX_E;
|
return BAD_MUTEX_E;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ret == WOLFSSL_SUCCESS) && (initRefCount == 0)) {
|
|
||||||
/* Initialize crypto for use with TLS connection */
|
|
||||||
|
|
||||||
#if FIPS_VERSION_GE(5,1)
|
#if FIPS_VERSION_GE(5,1)
|
||||||
|
if ((ret == WOLFSSL_SUCCESS) && (initRefCount == 0)) {
|
||||||
ret = wolfCrypt_SetPrivateKeyReadEnable_fips(1, WC_KEYTYPE_ALL);
|
ret = wolfCrypt_SetPrivateKeyReadEnable_fips(1, WC_KEYTYPE_ALL);
|
||||||
if (ret == 0)
|
if (ret == 0)
|
||||||
ret = WOLFSSL_SUCCESS;
|
ret = WOLFSSL_SUCCESS;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (ret == WOLFSSL_SUCCESS) {
|
if ((ret == WOLFSSL_SUCCESS) && (initRefCount == 0)) {
|
||||||
if (wolfCrypt_Init() != 0) {
|
/* Initialize crypto for use with TLS connection */
|
||||||
WOLFSSL_MSG("Bad wolfCrypt Init");
|
|
||||||
ret = WC_INIT_E;
|
if (wolfCrypt_Init() != 0) {
|
||||||
}
|
WOLFSSL_MSG("Bad wolfCrypt Init");
|
||||||
|
ret = WC_INIT_E;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(HAVE_GLOBAL_RNG) && !defined(WOLFSSL_MUTEX_INITIALIZER)
|
#if defined(HAVE_GLOBAL_RNG) && !defined(WOLFSSL_MUTEX_INITIALIZER)
|
||||||
|
Reference in New Issue
Block a user