aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-23 23:55:58 +0100
committerLars Magne Ingebrigtsen2014-11-23 23:55:58 +0100
commit8c4475f9cecc2bdae4f419273fe8e9c3e01351b1 (patch)
treeff0cdff041c73d660aac354fb028b63599a75903 /src
parent1653296fa233002e252b72b641d1327a3147ac3b (diff)
downloademacs-8c4475f9cecc2bdae4f419273fe8e9c3e01351b1.tar.gz
emacs-8c4475f9cecc2bdae4f419273fe8e9c3e01351b1.zip
* gnutls.c: Fix Windows function definition of gnutls_x509_crt_get_fingerprint.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gnutls.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8cd0fd9d594..b7c9a957d22 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,10 @@
12014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org> 12014-11-23 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 2
3 * gnutls.c: Fixed Windows function definition of 3 * gnutls.c: Fix Windows function definition of
4 gnutls_x509_crt_get_fingerprint. 4 gnutls_x509_crt_get_fingerprint.
5 5
6 * gnutls.c: Fix Windows return value for gnutls_pk_algorithm_get_name.
7
6 * gnutls.c (Fgnutls_boot): Save certificate for later inspection. 8 * gnutls.c (Fgnutls_boot): Save certificate for later inspection.
7 9
8 * process.h: Added more fields to Lisp_Process to track 10 * process.h: Added more fields to Lisp_Process to track
diff --git a/src/gnutls.c b/src/gnutls.c
index 7863513cce1..22e3aec0c21 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -169,7 +169,8 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_get_dn,
169 (gnutls_x509_crt_t, char *, size_t *)); 169 (gnutls_x509_crt_t, char *, size_t *));
170DEF_GNUTLS_FN (int, gnutls_x509_crt_get_pk_algorithm, 170DEF_GNUTLS_FN (int, gnutls_x509_crt_get_pk_algorithm,
171 (gnutls_x509_crt_t, unsigned int *)); 171 (gnutls_x509_crt_t, unsigned int *));
172DEF_GNUTLS_FN (int, gnutls_pk_algorithm_get_name, (gnutls_pk_algorithm_t)); 172DEF_GNUTLS_FN (const char*, gnutls_pk_algorithm_get_name,
173 (gnutls_pk_algorithm_t));
173DEF_GNUTLS_FN (int, gnutls_pk_bits_to_sec_param, 174DEF_GNUTLS_FN (int, gnutls_pk_bits_to_sec_param,
174 (gnutls_pk_algorithm_t, unsigned int)); 175 (gnutls_pk_algorithm_t, unsigned int));
175DEF_GNUTLS_FN (int, gnutls_x509_crt_get_issuer_unique_id, 176DEF_GNUTLS_FN (int, gnutls_x509_crt_get_issuer_unique_id,