From: Hubert Kario Date: Wed, 26 Jul 2017 11:23:17 +0000 (+0200) Subject: nicer formatting for MAC info X-Git-Tag: OpenSSL_1_1_1-pre1~972 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7eb370ee15715c8fc84582d08d1b1be539d948f6;p=oweals%2Fopenssl.git 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 Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1334) --- 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,