From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 16 May 2014 22:36:49 +0000 (+0200)
Subject: Print the openpgp DN only when gnutls_openpgp_crt_get_name() failed appropriately.
X-Git-Tag: gnutls_3_3_3~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c770d8ca7c46e96caee37eb9a12b15e8f4ff890d;p=thirdparty%2Fgnutls.git

Print the openpgp DN only when gnutls_openpgp_crt_get_name() failed appropriately.
---

diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index 5ac9031696..e7c02769f6 100644
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -351,12 +351,10 @@ static void print_cert(gnutls_buffer_st * str, gnutls_openpgp_crt_t cert)
 		size_t dn_size = 0;
 
 		err = gnutls_openpgp_crt_get_name(cert, i, NULL, &dn_size);
-		if (err != GNUTLS_E_SHORT_MEMORY_BUFFER
-		    && err != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE
-		    && err != GNUTLS_E_OPENPGP_UID_REVOKED)
+		if (err != GNUTLS_E_SHORT_MEMORY_BUFFER) {
 			addf(str, "error: get_name: %s\n",
 			     gnutls_strerror(err));
-		else {
+		} else {
 			dn = gnutls_malloc(dn_size);
 			if (!dn)
 				addf(str, "error: malloc (%d): %s\n",
@@ -423,12 +421,10 @@ print_oneline(gnutls_buffer_st * str, gnutls_openpgp_crt_t cert)
 		size_t dn_size = 0;
 
 		err = gnutls_openpgp_crt_get_name(cert, i, NULL, &dn_size);
-		if (err != GNUTLS_E_SHORT_MEMORY_BUFFER
-		    && err != GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE
-		    && err != GNUTLS_E_OPENPGP_UID_REVOKED)
+		if (err != GNUTLS_E_SHORT_MEMORY_BUFFER) {
 			addf(str, "unknown name (%s), ",
 			     gnutls_strerror(err));
-		else {
+		} else {
 			dn = gnutls_malloc(dn_size);
 			if (!dn)
 				addf(str, "unknown name (%s), ",