feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

allow dir path to be defined out NO_CYASSL_DIR, allow file or path on load_verify

Browse Source
This commit is contained in:
toddouska
2012-02-09 13:21:41 -08:00
parent bce2508878
commit 03cf62fd07
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/ssl.c
View File

@@ -53,11 +53,9 @@
#endif #endif
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
#ifdef USE_WINDOWS_API #if !defined(USE_WINDOWS_API) && !defined(NO_CYASSL_DIR)
#else
#include <dirent.h> #include <dirent.h>
#endif /* USE_WINDOWS_API */ #endif
#endif /* NO_FILESYSTEM */ #endif /* NO_FILESYSTEM */
@@ -1093,19 +1091,20 @@ static int ProcessFile(CYASSL_CTX* ctx, const char* fname, int format, int type,
} }
/* loads each file in path, no c_rehash */ /* loads file then loads each file in path, no c_rehash */
int CyaSSL_CTX_load_verify_locations(CYASSL_CTX* ctx, const char* file, int CyaSSL_CTX_load_verify_locations(CYASSL_CTX* ctx, const char* file,
const char* path) const char* path)
{ {
int ret; int ret = SSL_SUCCESS;
CYASSL_ENTER("SSL_CTX_load_verify_locations"); CYASSL_ENTER("CyaSSL_CTX_load_verify_locations");
(void)path; (void)path;
if (ctx == NULL || file == NULL) if (ctx == NULL || (file == NULL && path == NULL) )
return SSL_FAILURE; return SSL_FAILURE;
ret = ProcessFile(ctx, file, SSL_FILETYPE_PEM, CA_TYPE, NULL, 0); if (file)
ret = ProcessFile(ctx, file, SSL_FILETYPE_PEM, CA_TYPE, NULL, 0);
if (ret == SSL_SUCCESS && path) { if (ret == SSL_SUCCESS && path) {
/* try to load each regular file in path */ /* try to load each regular file in path */
@@ -1134,7 +1133,7 @@ int CyaSSL_CTX_load_verify_locations(CYASSL_CTX* ctx, const char* file,
} while (ret == SSL_SUCCESS && FindNextFileA(hFind, &FindFileData)); } while (ret == SSL_SUCCESS && FindNextFileA(hFind, &FindFileData));
FindClose(hFind); FindClose(hFind);
#else #elif !defined(NO_CYASSL_DIR)
struct dirent* entry; struct dirent* entry;
DIR* dir = opendir(path); DIR* dir = opendir(path);