diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2016-02-05 15:43:53 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2016-02-08 18:43:49 +0000 |
| commit | c9018bdf813e2a0ebb9e188318b4152743f8cb07 (patch) | |
| tree | eedee9020d85ad9893beb960cfea0e7a87c45e96 /apps/pkcs12.c | |
| parent | 116503cd51aa3195ce16a82ce9b789abe58a8928 (diff) | |
fix various formatting issues
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 8c0e7f15fa..2b9a08024c 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -542,9 +542,10 @@ int pkcs12_main(int argc, char **argv) if ((options & INFO) && PKCS12_mac_present(p12)) { ASN1_INTEGER *tmaciter; + PKCS12_get0_mac(NULL, NULL, NULL, &tmaciter, p12); BIO_printf(bio_err, "MAC Iteration %ld\n", - tmaciter ? ASN1_INTEGER_get(tmaciter) : 1); + tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L); } if (macver) { /* If we enter empty password try no password first */ @@ -665,6 +666,7 @@ int dump_certs_pkeys_bag(BIO *out, PKCS12_SAFEBAG *bag, char *pass, case NID_pkcs8ShroudedKeyBag: if (options & INFO) { X509_SIG *tp8; + BIO_printf(bio_err, "Shrouded Keybag: "); tp8 = PKCS12_SAFEBAG_get0_pkcs8(bag); alg_print(tp8->algor); |