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 5ac9031696cb54e6d6385832e708435adc235fd6..e7c02769f6c3cd2275d878e7c18920a316d8c3d7 100644 (file)
--- 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), ",