From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Mon, 8 Dec 2014 18:58:39 +0000 (+0100)
Subject: Put back :signature-algorithm into gnutls.c
X-Git-Tag: emacs-25.0.90~2635^2~158
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd;p=emacs.git

Put back :signature-algorithm into gnutls.c

(gnutls_certificate_details): Put :signature-algorithm back again,
which was removed by mistake.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index b791d18bccb..e4ba2c9d6b6 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  <jan.h.d@swipnet.se>
 
diff --git a/src/gnutls.c b/src/gnutls.c
index 2006bbcef0e..3893f4d3dfa 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);