From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 16 Jun 2015 10:29:38 +0000 (+0200)
Subject: certtool: use gnutls_pkcs7_print() - partially
X-Git-Tag: gnutls_3_4_2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cd0e1a0eeab2af32e9f0d80ecf6ec1e7052f96c;p=thirdparty%2Fgnutls.git

certtool: use gnutls_pkcs7_print() - partially
---

diff --git a/src/certtool.c b/src/certtool.c
index 7b47b6fb31..2efd0ca747 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -3653,10 +3653,8 @@ void pkcs7_info(common_info_st *cinfo)
 	gnutls_pkcs7_t pkcs7;
 	int result;
 	size_t size;
-	gnutls_datum_t data, b64;
+	gnutls_datum_t data, b64, str;
 	int indx, count;
-	unsigned i;
-	gnutls_pkcs7_signature_info_st info;
 
 	result = gnutls_pkcs7_init(&pkcs7);
 	if (result < 0) {
@@ -3675,19 +3673,16 @@ void pkcs7_info(common_info_st *cinfo)
 		exit(1);
 	}
 
-	for (i=0;;i++) {
-		result = gnutls_pkcs7_get_signature_info(pkcs7, i, &info);
-		if (result < 0)
-			break;
-
-		if (i==0)
-			fprintf(outfile, "Signers:\n");
-
-		print_pkcs7_sig_info(&info, cinfo);
-
-		gnutls_pkcs7_signature_info_deinit(&info);
+	result = gnutls_pkcs7_print(pkcs7, GNUTLS_CRT_PRINT_COMPACT, &str);
+	if (result < 0) {
+		fprintf(stderr, "printing error: %s\n",
+			gnutls_strerror(result));
+		exit(1);
 	}
 
+	fprintf(outfile, "%s", str.data);
+	gnutls_free(str.data);
+
 	/* Read and print the certificates.
 	 */
 	result = gnutls_pkcs7_get_crt_count(pkcs7);