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

separating two x509_store xmalloc checks

Browse Source
This commit is contained in:
gasbytes
2024-05-23 23:04:00 +02:00
parent d28dd602e5
commit 12a5cb45fb
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/internal.c
View File

@ -2460,19 +2460,21 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap)
return MEMORY_E; return MEMORY_E;
} }
XMEMSET(ctx->param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM)); XMEMSET(ctx->param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM));
/* WOLFSSL_X509_LOOKUP and param */
if ((ctx->x509_store.lookup.dirs = /* WOLFSSL_X509_LOOKUP */
(WOLFSSL_BY_DIR*)XMALLOC(sizeof(WOLFSSL_BY_DIR), if ((ctx->x509_store.lookup.dirs = (WOLFSSL_BY_DIR*)XMALLOC(sizeof(WOLFSSL_BY_DIR), heap, DYNAMIC_TYPE_OPENSSL)) == NULL) {
heap, DYNAMIC_TYPE_OPENSSL)) == NULL || WOLFSSL_MSG("ctx-x509_store.lookup.dirs: allocation error");
(ctx->x509_store.param = (WOLFSSL_X509_VERIFY_PARAM*)XMALLOC(
sizeof(WOLFSSL_X509_VERIFY_PARAM),
heap, DYNAMIC_TYPE_OPENSSL)) == NULL) {
WOLFSSL_MSG("ctx-x509_store.lookup.dir or ctx->x509_store.param memory "
"allocation error");
return MEMORY_E; return MEMORY_E;
} }
XMEMSET(ctx->x509_store.lookup.dirs, 0, sizeof(WOLFSSL_BY_DIR)); XMEMSET(ctx->x509_store.lookup.dirs, 0, sizeof(WOLFSSL_BY_DIR));
/* param */
if ((ctx->x509_store.param = (WOLFSSL_X509_VERIFY_PARAM*)XMALLOC(sizeof(WOLFSSL_X509_VERIFY_PARAM), heap, DYNAMIC_TYPE_OPENSSL)) == NULL) {
WOLFSSL_MSG("ctx->x509_store.param: allocation error");
return MEMORY_E;
}
XMEMSET(ctx->x509_store.param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM)); XMEMSET(ctx->x509_store.param, 0, sizeof(WOLFSSL_X509_VERIFY_PARAM));
if (wc_InitMutex(&ctx->x509_store.lookup.dirs->lock) != 0) { if (wc_InitMutex(&ctx->x509_store.lookup.dirs->lock) != 0) {
WOLFSSL_MSG("Bad mutex init"); WOLFSSL_MSG("Bad mutex init");
WOLFSSL_ERROR_VERBOSE(BAD_MUTEX_E); WOLFSSL_ERROR_VERBOSE(BAD_MUTEX_E);