wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-01-30 06:12:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3791 from TakayukiMatsuo/ZD11641

Browse Source 
Causes SSL_CTX_load_verify_locations and X509_LOOKUP_load_file to return zero on failure if WOLFSSL_ERR_CODE_OPENSSL is defined
This commit is contained in:
toddouska
2021-03-10 14:54:14 -08:00
committed by GitHub
parent 40b5d94db8 feeb0ceb96
commit 0bcde126d9
3 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -6920,8 +6920,10 @@ WOLFSSL_ABI
int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file,
const char* path)
{
return wolfSSL_CTX_load_verify_locations_ex(ctx, file, path,
int ret = wolfSSL_CTX_load_verify_locations_ex(ctx, file, path,
WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS);
return WS_RETURN_CODE(ret,WOLFSSL_FAILURE);
}
@@ -24669,15 +24671,15 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup,
const char* footer = NULL;
if (type != X509_FILETYPE_PEM)
return BAD_FUNC_ARG;
return WS_RETURN_CODE(BAD_FUNC_ARG,WOLFSSL_FAILURE);
fp = XFOPEN(file, "rb");
if (fp == XBADFILE)
return BAD_FUNC_ARG;
return WS_RETURN_CODE(BAD_FUNC_ARG,WOLFSSL_FAILURE);
if(XFSEEK(fp, 0, XSEEK_END) != 0) {
XFCLOSE(fp);
return WOLFSSL_BAD_FILE;
return WS_RETURN_CODE(WOLFSSL_BAD_FILE,WOLFSSL_FAILURE);
}
sz = XFTELL(fp);
XREWIND(fp);
@@ -24747,12 +24749,12 @@ end:
if (pem != NULL)
XFREE(pem, 0, DYNAMIC_TYPE_PEM);
XFCLOSE(fp);
return ret;
return WS_RETURN_CODE(ret,WOLFSSL_FAILURE);
#else
(void)lookup;
(void)file;
(void)type;
return WOLFSSL_FAILURE;
return WS_RETURN_CODE(WOLFSSL_FAILURE,WOLFSSL_FAILURE);
#endif
}