wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change void return from RAND_seed back to int.

Browse Source
This commit is contained in:
Kareem Abuobeid
2021-03-18 11:19:04 -07:00
parent 5aa23424a4
commit a85e348c0e
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -4981,7 +4981,10 @@ int wolfSSL_Init(void)
return BAD_MUTEX_E; return BAD_MUTEX_E;
} }
#endif #endif
wolfSSL_RAND_seed(NULL, 0); if (wolfSSL_RAND_seed(NULL, 0) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_RAND_Seed failed");
return WC_INIT_E;
}
#endif #endif
#ifndef NO_SESSION_CACHE #ifndef NO_SESSION_CACHE
@@ -31572,13 +31575,14 @@ static int wolfSSL_RAND_Init(void)
/* WOLFSSL_SUCCESS on ok */ /* WOLFSSL_SUCCESS on ok */
void wolfSSL_RAND_seed(const void* seed, int len) int wolfSSL_RAND_seed(const void* seed, int len)
{ {
#ifndef WOLFSSL_NO_OPENSSL_RAND_CB #ifndef WOLFSSL_NO_OPENSSL_RAND_CB
if (wolfSSL_RAND_InitMutex() == 0 && wc_LockMutex(&gRandMethodMutex) == 0) { if (wolfSSL_RAND_InitMutex() == 0 && wc_LockMutex(&gRandMethodMutex) == 0) {
if (gRandMethods && gRandMethods->seed) { if (gRandMethods && gRandMethods->seed) {
/* seed callback has return code, but function RAND_seed does not */ int ret = gRandMethods->seed(seed, len);
(void)gRandMethods->seed(seed, len); wc_UnLockMutex(&gRandMethodMutex);
return ret;
} }
wc_UnLockMutex(&gRandMethodMutex); wc_UnLockMutex(&gRandMethodMutex);
} }
@@ -31588,7 +31592,7 @@ void wolfSSL_RAND_seed(const void* seed, int len)
#endif #endif
/* Make sure global shared RNG (globalRNG) is initialized */ /* Make sure global shared RNG (globalRNG) is initialized */
(void)wolfSSL_RAND_Init(); return wolfSSL_RAND_Init();
} }

2
tests/api.c
View File

@@ -30474,7 +30474,7 @@ static void test_wolfSSL_RAND_set_rand_method(void)
rand_methods.status = &stub_rand_status; rand_methods.status = &stub_rand_status;
AssertIntEQ(wolfSSL_RAND_set_rand_method(&rand_methods), WOLFSSL_SUCCESS); AssertIntEQ(wolfSSL_RAND_set_rand_method(&rand_methods), WOLFSSL_SUCCESS);
wolfSSL_RAND_seed(buf, num); AssertIntEQ(wolfSSL_RAND_seed(buf, num), 123);
AssertIntEQ(wolfSSL_RAND_bytes(buf, num), 456); AssertIntEQ(wolfSSL_RAND_bytes(buf, num), 456);
AssertIntEQ(wolfSSL_RAND_pseudo_bytes(buf, num), 9876); AssertIntEQ(wolfSSL_RAND_pseudo_bytes(buf, num), 9876);
AssertIntEQ(wolfSSL_RAND_status(), 5432); AssertIntEQ(wolfSSL_RAND_status(), 5432);

2
wolfssl/ssl.h
View File

@@ -1408,7 +1408,7 @@ WOLFSSL_API const char* wolfSSL_RAND_file_name(char*, unsigned long);
WOLFSSL_API int wolfSSL_RAND_write_file(const char*); WOLFSSL_API int wolfSSL_RAND_write_file(const char*);
WOLFSSL_API int wolfSSL_RAND_load_file(const char*, long); WOLFSSL_API int wolfSSL_RAND_load_file(const char*, long);
WOLFSSL_API int wolfSSL_RAND_egd(const char*); WOLFSSL_API int wolfSSL_RAND_egd(const char*);
WOLFSSL_API void wolfSSL_RAND_seed(const void*, int); WOLFSSL_API int wolfSSL_RAND_seed(const void*, int);
WOLFSSL_API void wolfSSL_RAND_Cleanup(void); WOLFSSL_API void wolfSSL_RAND_Cleanup(void);
WOLFSSL_API void wolfSSL_RAND_add(const void*, int, double); WOLFSSL_API void wolfSSL_RAND_add(const void*, int, double);
WOLFSSL_API int wolfSSL_RAND_poll(void); WOLFSSL_API int wolfSSL_RAND_poll(void);