From e9fcefce9bb70f20c272a996443928c5f6ab8cd8 Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Fri, 23 Oct 2015 19:46:02 +0000 Subject: Import OpenSSL 1.0.2d. --- apps/dhparam.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'apps/dhparam.c') diff --git a/apps/dhparam.c b/apps/dhparam.c index d3b6d58ad2e5..57199a8d2ad8 100644 --- a/apps/dhparam.c +++ b/apps/dhparam.c @@ -489,9 +489,12 @@ int MAIN(int argc, char **argv) if (!noout) { if (outformat == FORMAT_ASN1) i = i2d_DHparams_bio(out, dh); - else if (outformat == FORMAT_PEM) - i = PEM_write_bio_DHparams(out, dh); - else { + else if (outformat == FORMAT_PEM) { + if (dh->q) + i = PEM_write_bio_DHxparams(out, dh); + else + i = PEM_write_bio_DHparams(out, dh); + } else { BIO_printf(bio_err, "bad output format specified for outfile\n"); goto end; } -- cgit v1.2.3