[SCM] GNU gnutls branch, master, updated. gnutls_3_0_9-31-g60fad8a

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=60fad8ae0685be34d13580d9b6b692aadae683fd

The branch, master has been updated
       via  60fad8ae0685be34d13580d9b6b692aadae683fd (commit)
      from  2f6f33e6f1a885f0f234974c3bce4ae65d37a86b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 60fad8ae0685be34d13580d9b6b692aadae683fd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Dec 28 22:01:00 2011 +0200

    Print the fingerprint of PGP keys and not only the key ID.

-----------------------------------------------------------------------

Summary of changes:
 src/certtool.c |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/certtool.c b/src/certtool.c
index de580fd..e6ae096 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -1389,11 +1389,27 @@ pgp_privkey_info (void)
         }
       else
         {
+          fprintf (outfile, "Public key ID: %s\n", raw_to_string (keyid, 8));
+        }
+
+      size = buffer_size;
+      if (i == -1)
+        ret = gnutls_openpgp_privkey_get_fingerprint (key, buffer, &size);
+      else
+        ret = gnutls_openpgp_privkey_get_subkey_fingerprint (key, i, buffer, 
&size);
+
+      if (ret < 0)
+        {
+          fprintf (stderr, "Error in fingerprint calculation: %s\n",
+                   gnutls_strerror (ret));
+        }
+      else
+        {
           gnutls_datum_t art;
 
-          fprintf (outfile, "Fingerprint: %s\n", raw_to_string (keyid, 8));
+          fprintf (outfile, "Fingerprint: %s\n", raw_to_string (buffer, size));
 
-          ret = gnutls_random_art(GNUTLS_RANDOM_ART_OPENSSH, cprint, bits, 
keyid, 8, &art);
+          ret = gnutls_random_art(GNUTLS_RANDOM_ART_OPENSSH, cprint, bits, 
buffer, size, &art);
           if (ret >= 0)
             {
               fprintf (outfile, "Fingerprint's random art:\n%s\n\n", art.data);


hooks/post-receive
-- 
GNU gnutls