root
/
openssl
mirror of https://github.com/openssl/openssl.git
1
0
Fork 0
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Clear outputs in PKCS12_parse error handling. 

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4145)
This commit is contained in:
Bernd Edlinger 2017-08-12 10:11:09 +02:00
parent 5b7b011525
commit 524fdd5155
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/pkcs12/p12_kiss.c
View File

@ -34,6 +34,12 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
{ {
STACK_OF(X509) *ocerts = NULL; STACK_OF(X509) *ocerts = NULL;
X509 *x = NULL; X509 *x = NULL;
if (pkey)
*pkey = NULL;
if (cert)
*cert = NULL;
/* Check for NULL PKCS12 structure */ /* Check for NULL PKCS12 structure */
if (!p12) { if (!p12) {
@ -42,11 +48,6 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
return 0; return 0;
} }
if (pkey)
*pkey = NULL;
if (cert)
*cert = NULL;
/* Check the mac */ /* Check the mac */
/* /*
@ -75,7 +76,7 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
if (!ocerts) { if (!ocerts) {
PKCS12err(PKCS12_F_PKCS12_PARSE, ERR_R_MALLOC_FAILURE); PKCS12err(PKCS12_F_PKCS12_PARSE, ERR_R_MALLOC_FAILURE);
return 0; goto err;
} }
if (!parse_pk12(p12, pass, -1, pkey, ocerts)) { if (!parse_pk12(p12, pass, -1, pkey, ocerts)) {
@ -111,10 +112,14 @@ int PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert,
err: err:
if (pkey) if (pkey) {
EVP_PKEY_free(*pkey); EVP_PKEY_free(*pkey);
if (cert) *pkey = NULL;
}
if (cert) {
X509_free(*cert); X509_free(*cert);
*cert = NULL;
}
X509_free(x); X509_free(x);
sk_X509_pop_free(ocerts, X509_free); sk_X509_pop_free(ocerts, X509_free);
return 0; return 0;