[Emacs-diffs] master ca7ad42: Put back :signature-algorithm into gnutls.c

[Lars Ingebrigtsen]

branch: master
commit ca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>

    Put back :signature-algorithm into gnutls.c
    
    (gnutls_certificate_details): Put :signature-algorithm back again,
    which was removed by mistake.
---
 src/ChangeLog |    2 ++
 src/gnutls.c  |   10 ++++++++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index b791d18..e4ba2c9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -5,6 +5,8 @@
        (gnutls_certificate_details): Clean up whitespace slightly.
        (Fgnutls_peer_status): Return the Diffie-Hellman prime bits for
        the connection.
+       (gnutls_certificate_details): Put :signature-algorithm back again,
+       which was removed by mistake.
 
 2014-12-07  Jan Djärv  <address@hidden>
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 2006bbc..3893f4d 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -910,6 +910,16 @@ gnutls_certificate_details (gnutls_x509_crt_t cert)
     }
 #endif
 
+  /* Signature. */
+  err = fn_gnutls_x509_crt_get_signature_algorithm (cert);
+  if (err >= GNUTLS_E_SUCCESS)
+    {
+      const char *name = fn_gnutls_sign_get_name (err);
+      if (name)
+       res = nconc2 (res, list2 (intern (":signature-algorithm"),
+                                 build_string (name)));
+    }
+
   /* Public key ID. */
   buf_size = 0;
   err = fn_gnutls_x509_crt_get_key_id (cert, 0, NULL, &buf_size);