summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkcs12.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr.bin/openssl/pkcs12.c')
-rw-r--r--src/usr.bin/openssl/pkcs12.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c
index 69d2d0a950..2e852cebc7 100644
--- a/src/usr.bin/openssl/pkcs12.c
+++ b/src/usr.bin/openssl/pkcs12.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs12.c,v 1.9 2017/01/20 08:57:12 deraadt Exp $ */ 1/* $OpenBSD: pkcs12.c,v 1.10 2018/02/07 05:47:55 jsing Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project. 3 * project.
4 */ 4 */
@@ -584,7 +584,7 @@ export_end:
584 goto end; 584 goto end;
585 } 585 }
586 ret = 0; 586 ret = 0;
587end: 587 end:
588 if (p12) 588 if (p12)
589 PKCS12_free(p12); 589 PKCS12_free(p12);
590 BIO_free(in); 590 BIO_free(in);
@@ -637,7 +637,7 @@ dump_certs_keys_p12(BIO * out, PKCS12 * p12, char *pass,
637 } 637 }
638 ret = 1; 638 ret = 1;
639 639
640err: 640 err:
641 641
642 if (asafes) 642 if (asafes)
643 sk_PKCS7_pop_free(asafes, PKCS7_free); 643 sk_PKCS7_pop_free(asafes, PKCS7_free);
@@ -768,7 +768,7 @@ get_cert_chain(X509 * cert, X509_STORE * store, STACK_OF(X509) ** chain)
768 goto err; 768 goto err;
769 } else 769 } else
770 chn = X509_STORE_CTX_get1_chain(&store_ctx); 770 chn = X509_STORE_CTX_get1_chain(&store_ctx);
771err: 771 err:
772 X509_STORE_CTX_cleanup(&store_ctx); 772 X509_STORE_CTX_cleanup(&store_ctx);
773 *chain = chn; 773 *chain = chn;
774 774