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

Fix X509_NAME issues for Apache

Browse Source
This commit is contained in:
Carie Pointer
2020-01-03 15:40:52 -08:00
parent 7d2adb2fc0
commit 26eea36d7f
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ssl.c
View File

@ -34566,15 +34566,17 @@ void* wolfSSL_GetDhAgreeCtx(WOLFSSL* ssl)
/* copy contents */ /* copy contents */
XMEMCPY(dup, name, sizeof(WOLFSSL_X509_NAME)); XMEMCPY(dup, name, sizeof(WOLFSSL_X509_NAME));
InitX509Name(dup, 1);
/* Need to set dynamicName before copying */
dup->dynamicName = 1;
dup->sz = name->sz;
/* handle dynamic portions */ /* handle dynamic portions */
if (name->dynamicName) { if (!(dup->name = (char*)XMALLOC(name->sz, 0,
if (!(dup->name = (char*)XMALLOC(name->sz, 0, DYNAMIC_TYPE_OPENSSL))) {
DYNAMIC_TYPE_OPENSSL))) { goto err;
goto err;
}
XMEMCPY(dup->name, name->name, name->sz);
} }
XMEMCPY(dup->name, name->name, name->sz);
#if (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)) && \ #if (defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)) && \
!defined(NO_ASN) !defined(NO_ASN)
if (!(dup->fullName.fullName = (char*)XMALLOC(name->fullName.fullNameLen, if (!(dup->fullName.fullName = (char*)XMALLOC(name->fullName.fullNameLen,
@ -39699,10 +39701,24 @@ void wolfSSL_sk_X509_NAME_pop_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk,
XFREE(sk, sk->heap, DYNAMIC_TYPE_OPENSSL); XFREE(sk, sk->heap, DYNAMIC_TYPE_OPENSSL);
} }
/* Free only the sk structure */ /* Free only the sk structure, NOT X509_NAME members */
void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk) void wolfSSL_sk_X509_NAME_free(WOLF_STACK_OF(WOLFSSL_X509_NAME)* sk)
{ {
wolfSSL_sk_X509_NAME_pop_free(sk, NULL); WOLFSSL_STACK* node;
WOLFSSL_ENTER("wolfSSL_sk_X509_NAME_free");
if (sk == NULL)
return;
node = sk->next;
while (sk->num > 1) {
WOLFSSL_STACK* tmp = node;
node = node->next;
XFREE(tmp, NULL, DYNAMIC_TYPE_OPENSSL);
sk->num -= 1;
}
XFREE(sk, sk->heap, DYNAMIC_TYPE_OPENSSL);
} }
#if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX) #if defined(WOLFSSL_APACHE_HTTPD) || defined(OPENSSL_ALL) || defined(WOLFSSL_NGINX)