wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Causes SSL_CTX_load_verify_locations and X509_LOOKUP_load_file to return zero on failure if WOLFSSL_ERR_CODE_OPENSSL is defined

Browse Source
This commit is contained in:
TakayukiMatsuo
2021-02-22 08:05:11 +09:00
parent 078d78a884
commit 4264a49246
3 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ssl.c
View File

@@ -6913,8 +6913,10 @@ WOLFSSL_ABI
int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file, int wolfSSL_CTX_load_verify_locations(WOLFSSL_CTX* ctx, const char* file,
const char* path) 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); WOLFSSL_LOAD_VERIFY_DEFAULT_FLAGS);
return RETURN_CODE(ret,0);
} }
@@ -24407,15 +24409,15 @@ int wolfSSL_X509_LOOKUP_load_file(WOLFSSL_X509_LOOKUP* lookup,
const char* footer = NULL; const char* footer = NULL;
if (type != X509_FILETYPE_PEM) if (type != X509_FILETYPE_PEM)
return BAD_FUNC_ARG; return RETURN_CODE(BAD_FUNC_ARG,0);
fp = XFOPEN(file, "rb"); fp = XFOPEN(file, "rb");
if (fp == XBADFILE) if (fp == XBADFILE)
return BAD_FUNC_ARG; return RETURN_CODE(BAD_FUNC_ARG,0);
if(XFSEEK(fp, 0, XSEEK_END) != 0) { if(XFSEEK(fp, 0, XSEEK_END) != 0) {
XFCLOSE(fp); XFCLOSE(fp);
return WOLFSSL_BAD_FILE; return RETURN_CODE(WOLFSSL_BAD_FILE,0);
} }
sz = XFTELL(fp); sz = XFTELL(fp);
XREWIND(fp); XREWIND(fp);
@@ -24485,12 +24487,12 @@ end:
if (pem != NULL) if (pem != NULL)
XFREE(pem, 0, DYNAMIC_TYPE_PEM); XFREE(pem, 0, DYNAMIC_TYPE_PEM);
XFCLOSE(fp); XFCLOSE(fp);
return ret; return RETURN_CODE(ret,0);
#else #else
(void)lookup; (void)lookup;
(void)file; (void)file;
(void)type; (void)type;
return WOLFSSL_FAILURE; return RETURN_CODE(WOLFSSL_FAILURE,0);
#endif #endif
} }

9
tests/api.c
View File

@@ -953,17 +953,20 @@ static void test_wolfSSL_CTX_load_verify_locations(void)
AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, NULL, NULL), WOLFSSL_FAILURE); AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, NULL, NULL), WOLFSSL_FAILURE);
/* invalid ca file */ /* invalid ca file */
AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, bogusFile, NULL), WOLFSSL_BAD_FILE); AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, bogusFile, NULL),
RETURN_CODE(WOLFSSL_BAD_FILE,0));
#if !defined(NO_WOLFSSL_DIR) && !defined(WOLFSSL_TIRTOS) #if !defined(NO_WOLFSSL_DIR) && !defined(WOLFSSL_TIRTOS)
/* invalid path */ /* invalid path */
AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, NULL, bogusFile), BAD_PATH_ERROR); AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, NULL, bogusFile),
RETURN_CODE(BAD_PATH_ERROR,0));
#endif #endif
/* load ca cert */ /* load ca cert */
#ifdef NO_RSA #ifdef NO_RSA
AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, caCertFile, NULL), ASN_UNKNOWN_OID_E); AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, caCertFile, NULL),
RETURN_CODE(ASN_UNKNOWN_OID_E,0));
#else /* Skip the following test without RSA certs. */ #else /* Skip the following test without RSA certs. */
AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, caCertFile, NULL), WOLFSSL_SUCCESS); AssertIntEQ(wolfSSL_CTX_load_verify_locations(ctx, caCertFile, NULL), WOLFSSL_SUCCESS);

6
wolfssl/ssl.h
View File

@@ -674,6 +674,12 @@ enum AlertLevel {
alert_fatal = 2 alert_fatal = 2
}; };
#if defined(WOLFSSL_ERROR_CODE_OPENSSL)
#define RETURN_CODE(w,o) ((w < 0)?o:w)
#else
#define RETURN_CODE(w,o) (w)
#endif
/* Maximum master key length (SECRET_LEN) */ /* Maximum master key length (SECRET_LEN) */
#define WOLFSSL_MAX_MASTER_KEY_LENGTH 48 #define WOLFSSL_MAX_MASTER_KEY_LENGTH 48
/* Maximum number of groups that can be set */ /* Maximum number of groups that can be set */