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

Merge pull request #2796 from JacobBarthelmeh/Compatibility-Layer

Browse Source 
free existing cert store when setting a new one
This commit is contained in:
toddouska
2020-02-17 11:37:56 -08:00
committed by GitHub
parent defa54f40d 8e1adb125c
commit fda322829f
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/ssl.c
View File

@ -14897,6 +14897,13 @@ int wolfSSL_set_compression(WOLFSSL* ssl)
wolfSSL_CertManagerFree(ctx->cm); wolfSSL_CertManagerFree(ctx->cm);
} }
ctx->cm = str->cm; ctx->cm = str->cm;
/* free existing store if it exists */
if (ctx->x509_store_pt != NULL) {
/* cert manager was free'd a little earlier in this function */
ctx->x509_store_pt->cm = NULL;
}
wolfSSL_X509_STORE_free(ctx->x509_store_pt);
ctx->x509_store.cache = str->cache; ctx->x509_store.cache = str->cache;
ctx->x509_store_pt = str; /* take ownership of store and free it ctx->x509_store_pt = str; /* take ownership of store and free it
with CTX free */ with CTX free */

23
tests/api.c
View File

@ -21238,8 +21238,10 @@ static void test_wolfSSL_CTX_set_srp_password(void)
static void test_wolfSSL_X509_STORE(void) static void test_wolfSSL_X509_STORE(void)
{ {
#if defined(OPENSSL_EXTRA) && defined(HAVE_CRL) && !defined(NO_RSA) #if defined(OPENSSL_EXTRA) && !defined(NO_RSA)
X509_STORE *store; X509_STORE *store;
#ifdef HAVE_CRL
X509_CRL *crl; X509_CRL *crl;
X509 *x509; X509 *x509;
const char crl_pem[] = "./certs/crl/crl.pem"; const char crl_pem[] = "./certs/crl/crl.pem";
@ -21260,6 +21262,25 @@ static void test_wolfSSL_X509_STORE(void)
AssertIntEQ(X509_STORE_add_crl(store, crl), SSL_SUCCESS); AssertIntEQ(X509_STORE_add_crl(store, crl), SSL_SUCCESS);
X509_CRL_free(crl); X509_CRL_free(crl);
X509_STORE_free(store); X509_STORE_free(store);
#endif /* HAVE_CRL */
#ifndef WOLFCRYPT_ONLY
{
SSL_CTX* ctx;
#ifndef NO_WOLFSSL_SERVER
AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_server_method()));
#else
AssertNotNull(ctx = SSL_CTX_new(wolfSSLv23_client_method()));
#endif
AssertNotNull(store = (X509_STORE *)X509_STORE_new());
SSL_CTX_set_cert_store(ctx, store);
AssertNotNull(store = (X509_STORE *)X509_STORE_new());
SSL_CTX_set_cert_store(ctx, store);
SSL_CTX_free(ctx);
}
#endif
printf(resultFmt, passed); printf(resultFmt, passed);
#endif #endif
return; return;