summaryrefslogtreecommitdiff
path: root/apps/pkcs12.c
diff options
context:
space:
mode:
authorHubert Kario <hkario@redhat.com>2017-07-26 13:23:17 +0200
committerRich Salz <rsalz@openssl.org>2017-07-26 15:04:54 -0400
commit7eb370ee15715c8fc84582d08d1b1be539d948f6 (patch)
treef76bc8e0f30b54099403c46f2924c358768ede5a /apps/pkcs12.c
parente15c95ce8596bcc2a5f5e163ff78ccf469dbf994 (diff)
downloadopenssl-new-7eb370ee15715c8fc84582d08d1b1be539d948f6.tar.gz
nicer formatting for MAC info
The info printing for PBES2 already uses space after type and commas to separate items in the line so use the same format for MAC info too. Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/1334)
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r--apps/pkcs12.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c
index c35f164041..122dcab10a 100644
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -530,9 +530,9 @@ int pkcs12_main(int argc, char **argv)
/* current hash algorithms do not use parameters so extract just name,
in future alg_print() may be needed */
X509_ALGOR_get0(&macobj, NULL, NULL, macalgid);
- BIO_puts(bio_err, "MAC:");
+ BIO_puts(bio_err, "MAC: ");
i2a_ASN1_OBJECT(bio_err, macobj);
- BIO_printf(bio_err, " Iteration %ld\n",
+ BIO_printf(bio_err, ", Iteration %ld\n",
tmaciter != NULL ? ASN1_INTEGER_get(tmaciter) : 1L);
BIO_printf(bio_err, "MAC length: %ld, salt length: %ld\n",
tmac != NULL ? ASN1_STRING_length(tmac) : 0L,