From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 6 Jun 2017 07:49:09 +0000 (+0200)
Subject: certtool: fix DER export with --p7-info
X-Git-Tag: gnutls_3_6_0~472
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6446687d43968db27e6d959de49e34c0bcbf40e2;p=thirdparty%2Fgnutls.git

certtool: fix DER export with --p7-info

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
---

diff --git a/src/certtool.c b/src/certtool.c
index 514dd381fa..1eb4f9b808 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3841,15 +3841,17 @@ void pkcs7_info(common_info_st *cinfo, unsigned display_data)
 			app_exit(1);
 		}
 	} else {
-		ret = gnutls_pkcs7_print(pkcs7, GNUTLS_CRT_PRINT_FULL, &str);
-		if (ret < 0) {
-			fprintf(stderr, "printing error: %s\n",
-				gnutls_strerror(ret));
-			app_exit(1);
-		}
+		if (outcert_format == GNUTLS_X509_FMT_PEM) {
+			ret = gnutls_pkcs7_print(pkcs7, GNUTLS_CRT_PRINT_FULL, &str);
+			if (ret < 0) {
+				fprintf(stderr, "printing error: %s\n",
+					gnutls_strerror(ret));
+				app_exit(1);
+			}
 
-		fprintf(outfile, "%s", str.data);
-		gnutls_free(str.data);
+			fprintf(outfile, "%s", str.data);
+			gnutls_free(str.data);
+		}
 
 		size = lbuffer_size;
 		ret =