diff options
| author | nectar <nectar@FreeBSD.org> | 2002-07-30 12:44:15 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-07-30 12:44:15 +0000 |
| commit | 0aed2eea83b351d68092e43b5a9496ce3dd5043d (patch) | |
| tree | a6133c35ab337984fbbd26293f8b1ad7a958132b /crypto/openssl/apps/pkcs12.c | |
| parent | 1f8c2aa1763b5d8a328b2fd4053396e94ea48d35 (diff) | |
| download | FreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.zip FreeBSD-src-0aed2eea83b351d68092e43b5a9496ce3dd5043d.tar.gz | |
Import of OpenSSL 0.9.6d.
Diffstat (limited to 'crypto/openssl/apps/pkcs12.c')
| -rw-r--r-- | crypto/openssl/apps/pkcs12.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/openssl/apps/pkcs12.c b/crypto/openssl/apps/pkcs12.c index 6789169..aeba62e 100644 --- a/crypto/openssl/apps/pkcs12.c +++ b/crypto/openssl/apps/pkcs12.c @@ -749,7 +749,10 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass, print_attribs (out, bag->attrib, "Bag Attributes"); if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen))) return 0; - if (!(pkey = EVP_PKCS82PKEY (p8))) return 0; + if (!(pkey = EVP_PKCS82PKEY (p8))) { + PKCS8_PRIV_KEY_INFO_free(p8); + return 0; + } print_attribs (out, p8->attributes, "Key Attributes"); PKCS8_PRIV_KEY_INFO_free(p8); PEM_write_bio_PrivateKey (out, pkey, enc, NULL, 0, NULL, pempass); |
