wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve use of XGETENV in wolfSSL_RAND_file_name to check for macro.

Browse Source
This commit is contained in:
David Garske
2024-01-19 12:13:19 -08:00
parent ac81d9d29c
commit a4affd9431
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@ -32878,7 +32878,7 @@ int wolfSSL_RAND_seed(const void* seed, int len)
*/ */
const char* wolfSSL_RAND_file_name(char* fname, unsigned long len) const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
{ {
#ifndef NO_FILESYSTEM #if !defined(NO_FILESYSTEM) && defined(XGETENV)
char* rt; char* rt;
WOLFSSL_ENTER("wolfSSL_RAND_file_name"); WOLFSSL_ENTER("wolfSSL_RAND_file_name");
@ -32888,7 +32888,7 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
} }
XMEMSET(fname, 0, len); XMEMSET(fname, 0, len);
/* if access to stdlib.h */
if ((rt = XGETENV("RANDFILE")) != NULL) { if ((rt = XGETENV("RANDFILE")) != NULL) {
if (len > XSTRLEN(rt)) { if (len > XSTRLEN(rt)) {
XMEMCPY(fname, rt, XSTRLEN(rt)); XMEMCPY(fname, rt, XSTRLEN(rt));
@ -32901,7 +32901,7 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
/* $RANDFILE was not set or is too large, check $HOME */ /* $RANDFILE was not set or is too large, check $HOME */
if (rt == NULL) { if (rt == NULL) {
char ap[] = "/.rnd"; const char ap[] = "/.rnd";
WOLFSSL_MSG("Environment variable RANDFILE not set"); WOLFSSL_MSG("Environment variable RANDFILE not set");
if ((rt = XGETENV("HOME")) == NULL) { if ((rt = XGETENV("HOME")) == NULL) {
@ -32909,7 +32909,7 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
return NULL; return NULL;
} }
if (len > XSTRLEN(rt) + XSTRLEN(ap)) { if (len > XSTRLEN(rt) + XSTRLEN(ap)) {
fname[0] = '\0'; fname[0] = '\0';
XSTRNCAT(fname, rt, len); XSTRNCAT(fname, rt, len);
XSTRNCAT(fname, ap, len - XSTRLEN(rt)); XSTRNCAT(fname, ap, len - XSTRLEN(rt));
@ -32923,9 +32923,9 @@ const char* wolfSSL_RAND_file_name(char* fname, unsigned long len)
return fname; return fname;
#else #else
/* no filesystem defined */
WOLFSSL_ENTER("wolfSSL_RAND_file_name"); WOLFSSL_ENTER("wolfSSL_RAND_file_name");
WOLFSSL_MSG("No filesystem feature enabled, not compiled in"); WOLFSSL_MSG("RAND_file_name requires filesystem and getenv support, "
"not compiled in");
(void)fname; (void)fname;
(void)len; (void)len;
return NULL; return NULL;