From dc46fc25d7e4388f1a6f972bfdf4e24c2b81a0f7 Mon Sep 17 00:00:00 2001 From: Hubert Kario Date: Wed, 20 Jul 2016 14:10:29 +0200 Subject: [PATCH] pkcs12.c better formatting for unsupported params since when we get to this point, other information was already printed, we should insert some whitespace between already printed data and this "unsupported parameters" error message Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/1334) --- apps/pkcs12.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 28ae2d5539..6be6b78e9d 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -782,7 +782,7 @@ static int alg_print(const X509_ALGOR *alg) if (aparamtype == V_ASN1_SEQUENCE) pbe2 = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBE2PARAM)); if (pbe2 == NULL) { - BIO_puts(bio_err, ""); + BIO_puts(bio_err, ", "); goto done; } X509_ALGOR_get0(&aoid, &aparamtype, &aparam, pbe2->keyfunc); @@ -798,7 +798,7 @@ static int alg_print(const X509_ALGOR *alg) if (aparamtype == V_ASN1_SEQUENCE) kdf = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBKDF2PARAM)); if (kdf == NULL) { - BIO_puts(bio_err, ""); + BIO_puts(bio_err, ", "); goto done; } @@ -817,7 +817,7 @@ static int alg_print(const X509_ALGOR *alg) if (aparamtype == V_ASN1_SEQUENCE) pbe = ASN1_item_unpack(aparam, ASN1_ITEM_rptr(PBEPARAM)); if (pbe == NULL) { - BIO_puts(bio_err, ""); + BIO_puts(bio_err, ", "); goto done; } BIO_printf(bio_err, ", Iteration %ld", ASN1_INTEGER_get(pbe->iter)); -- 2.25.1