nicer formatting for MAC info
authorHubert Kario <hkario@redhat.com>
Wed, 26 Jul 2017 11:23:17 +0000 (13:23 +0200)
committerRich Salz <rsalz@openssl.org>
Wed, 26 Jul 2017 19:04:54 +0000 (15:04 -0400)
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)

apps/pkcs12.c

index c35f164041238431b7fc77708bfbf2863b8960b5..122dcab10aa3472785a7cfb946efb1536d7e6e20 100644 (file)
@@ -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,