wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix two leaks in X509_REQ_to_X509

Browse source 
Issue #182

Reviewed-by: Stephen Henson <steve@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
FdaSilvaYY 2016-03-17 00:15:48 +01:00
parent 6c13488c4e
commit 0517538d1a
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
crypto/x509/x509_r2x.c
View file

@ -70,10 +70,11 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
X509 *ret = NULL;
X509_CINF *xi = NULL;
X509_NAME *xn;
EVP_PKEY *pubkey = NULL;
if ((ret = X509_new()) == NULL) {
X509err(X509_F_X509_REQ_TO_X509, ERR_R_MALLOC_FAILURE);
goto err;
return NULL;
}
/* duplicate the request */
@ -89,9 +90,9 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
}
xn = X509_REQ_get_subject_name(r);
if (X509_set_subject_name(ret, X509_NAME_dup(xn)) == 0)
if (X509_set_subject_name(ret, xn) == 0)
goto err;
if (X509_set_issuer_name(ret, X509_NAME_dup(xn)) == 0)
if (X509_set_issuer_name(ret, xn) == 0)
goto err;
if (X509_gmtime_adj(xi->validity.notBefore, 0) == NULL)
@ -100,12 +101,21 @@ X509 *X509_REQ_to_X509(X509_REQ *r, int days, EVP_PKEY *pkey)
NULL)
goto err;
X509_set_pubkey(ret, X509_REQ_get_pubkey(r));
pubkey = X509_REQ_get_pubkey(r);
if (pubkey == NULL)
goto err;
if (!X509_set_pubkey(ret, pubkey))
goto err_pkey;
EVP_PKEY_free(pubkey);
if (!X509_sign(ret, pkey, EVP_md5()))
goto err;
return ret;
err_pkey:
EVP_PKEY_free(pubkey);
err:
X509_free(ret);
return NULL;