diff options
| author | Lars Magne Ingebrigtsen | 2014-12-08 19:58:39 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2014-12-08 19:58:39 +0100 |
| commit | ca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd (patch) | |
| tree | 90938d6869e8745cf3ca3c92ca9cacc1683704ce | |
| parent | a0fe9b0481eb85667e99b987070af13311a95e54 (diff) | |
| download | emacs-ca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd.tar.gz emacs-ca7ad4271c3b01efdcf0a64ec1ec8b789ed026fd.zip | |
Put back :signature-algorithm into gnutls.c
(gnutls_certificate_details): Put :signature-algorithm back again,
which was removed by mistake.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/gnutls.c | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b791d18bccb..e4ba2c9d6b6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | (gnutls_certificate_details): Clean up whitespace slightly. | 5 | (gnutls_certificate_details): Clean up whitespace slightly. |
| 6 | (Fgnutls_peer_status): Return the Diffie-Hellman prime bits for | 6 | (Fgnutls_peer_status): Return the Diffie-Hellman prime bits for |
| 7 | the connection. | 7 | the connection. |
| 8 | (gnutls_certificate_details): Put :signature-algorithm back again, | ||
| 9 | which was removed by mistake. | ||
| 8 | 10 | ||
| 9 | 2014-12-07 Jan Djärv <jan.h.d@swipnet.se> | 11 | 2014-12-07 Jan Djärv <jan.h.d@swipnet.se> |
| 10 | 12 | ||
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) | |||
| 910 | } | 910 | } |
| 911 | #endif | 911 | #endif |
| 912 | 912 | ||
| 913 | /* Signature. */ | ||
| 914 | err = fn_gnutls_x509_crt_get_signature_algorithm (cert); | ||
| 915 | if (err >= GNUTLS_E_SUCCESS) | ||
| 916 | { | ||
| 917 | const char *name = fn_gnutls_sign_get_name (err); | ||
| 918 | if (name) | ||
| 919 | res = nconc2 (res, list2 (intern (":signature-algorithm"), | ||
| 920 | build_string (name))); | ||
| 921 | } | ||
| 922 | |||
| 913 | /* Public key ID. */ | 923 | /* Public key ID. */ |
| 914 | buf_size = 0; | 924 | buf_size = 0; |
| 915 | err = fn_gnutls_x509_crt_get_key_id (cert, 0, NULL, &buf_size); | 925 | err = fn_gnutls_x509_crt_get_key_id (cert, 0, NULL, &buf_size); |