[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Wed May 4 12:57:22 UTC 2016
The branch master has been updated
via c73aa309049c4f04ec81f0f1cf552eab8456a16e (commit)
from e6c5dbc8e82214f659d5b905d7b4a04a8d1faa8d (commit)
- Log -----------------------------------------------------------------
commit c73aa309049c4f04ec81f0f1cf552eab8456a16e
Author: Richard Levitte <levitte at openssl.org>
Date: Wed May 4 14:44:10 2016 +0200
Check return of PEM_write_* functions and report possible errors
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1025)
-----------------------------------------------------------------------
Summary of changes:
apps/pkcs12.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index 406b103..af5f670 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -674,6 +674,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
PKCS8_PRIV_KEY_INFO *p8;
X509 *x509;
STACK_OF(X509_ATTRIBUTE) *attrs;
+ int ret = 0;
attrs = PKCS12_SAFEBAG_get0_attrs(bag);
@@ -688,7 +689,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
if ((pkey = EVP_PKCS82PKEY(p8)) == NULL)
return 0;
print_attribs(out, PKCS8_pkey_get0_attrs(p8), "Key Attributes");
- PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
+ ret = PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
EVP_PKEY_free(pkey);
break;
@@ -713,7 +714,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
}
print_attribs(out, PKCS8_pkey_get0_attrs(p8), "Key Attributes");
PKCS8_PRIV_KEY_INFO_free(p8);
- PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
+ ret = PEM_write_bio_PrivateKey(out, pkey, enc, NULL, 0, NULL, pempass);
EVP_PKEY_free(pkey);
break;
@@ -733,7 +734,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
if ((x509 = PKCS12_SAFEBAG_get1_cert(bag)) == NULL)
return 0;
dump_cert_text(out, x509);
- PEM_write_bio_X509(out, x509);
+ ret = PEM_write_bio_X509(out, x509);
X509_free(x509);
break;
@@ -750,7 +751,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass,
BIO_printf(bio_err, "\n");
return 1;
}
- return 1;
+ return ret;
}
/* Given a single certificate return a verified chain or NULL if error */
More information about the openssl-commits
mailing list