From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 28 Dec 2011 18:57:52 +0000 (+0200)
Subject: Print the randomart on the key ID and not the fingerprint.
X-Git-Tag: gnutls_3_0_10~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=710db6c8fc44ddbf7bd4f532c322645ce4fd590d;p=thirdparty%2Fgnutls.git

Print the randomart on the key ID and not the fingerprint.
---

diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index af1dd3b5c9..b65aade744 100644
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -129,7 +129,7 @@ print_key_fingerprint (gnutls_buffer_st * str, gnutls_openpgp_crt_t cert)
   
   adds (str, _("\tpublic key's randomart:\n"));
   adds (str, p);
-  adds (str, "\n");
+  adds (str, "\n\n");
 
   gnutls_free(p);
 }
diff --git a/lib/x509/output.c b/lib/x509/output.c
index 1f97b9be33..2ecbff2a53 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -1349,9 +1349,6 @@ print_fingerprint (gnutls_buffer_st * str, gnutls_x509_crt_t cert,
   int err;
   char buffer[MAX_HASH_SIZE];
   size_t size = sizeof (buffer);
-  const char* name;
-  char* p;
-  unsigned int bits;
   
   err = gnutls_x509_crt_get_fingerprint (cert, algo, buffer, &size);
   if (err < 0)
@@ -1366,24 +1363,6 @@ print_fingerprint (gnutls_buffer_st * str, gnutls_x509_crt_t cert,
     adds (str, _("\tSHA-1 fingerprint:\n\t\t"));
   _gnutls_buffer_hexprint (str, buffer, size);
   adds (str, "\n");
-
-  err = gnutls_x509_crt_get_pk_algorithm (cert, &bits);
-  if (err < 0)
-    return;
-    
-  name = gnutls_pk_get_name(err);
-  if (name == NULL)
-    return;
-
-  p = _gnutls_key_fingerprint_randomart(buffer, size, name, bits);
-  if (p == NULL)
-    return;
-  
-  adds (str, _("\tpublic key's randomart:\n"));
-  adds (str, p);
-  adds (str, "\n\n");
-
-  gnutls_free(p);
 }
 
 static void
@@ -1392,6 +1371,9 @@ print_keyid (gnutls_buffer_st * str, gnutls_x509_crt_t cert)
   int err;
   char buffer[32];
   size_t size = sizeof(buffer);
+  const char* name;
+  char* p;
+  unsigned int bits;
 
   err = gnutls_x509_crt_get_key_id (cert, 0, buffer, &size);
   if (err < 0)
@@ -1403,6 +1385,24 @@ print_keyid (gnutls_buffer_st * str, gnutls_x509_crt_t cert)
   adds (str, _("\tPublic Key Id:\n\t\t"));
   _gnutls_buffer_hexprint (str, buffer, size);
   adds (str, "\n");
+
+  err = gnutls_x509_crt_get_pk_algorithm (cert, &bits);
+  if (err < 0)
+    return;
+    
+  name = gnutls_pk_get_name(err);
+  if (name == NULL)
+    return;
+
+  p = _gnutls_key_fingerprint_randomart(buffer, size, name, bits);
+  if (p == NULL)
+    return;
+  
+  adds (str, _("\tpublic key's randomart:\n"));
+  adds (str, p);
+  adds (str, "\n\n");
+
+  gnutls_free(p);
 }
 
 static void