[Emacs-diffs] master 01/01: * gnutls.c: Fix Windows function definition of gnutls_x509_crt_get_fingerprint.

[Lars Ingebrigtsen]

branch: master
commit 8c4475f9cecc2bdae4f419273fe8e9c3e01351b1
Author: Lars Magne Ingebrigtsen <address@hidden>
Date:   Sun Nov 23 23:55:58 2014 +0100

    * gnutls.c: Fix Windows function definition of 
gnutls_x509_crt_get_fingerprint.
---
 src/ChangeLog |    4 +++-
 src/gnutls.c  |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cd0fd9..b7c9a95 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,10 @@
 2014-11-23  Lars Magne Ingebrigtsen  <address@hidden>
 
-       * gnutls.c: Fixed Windows function definition of
+       * gnutls.c: Fix Windows function definition of
        gnutls_x509_crt_get_fingerprint.
 
+       * gnutls.c: Fix Windows return value for gnutls_pk_algorithm_get_name.
+
        * gnutls.c (Fgnutls_boot): Save certificate for later inspection.
 
        * process.h: Added more fields to Lisp_Process to track
diff --git a/src/gnutls.c b/src/gnutls.c
index 7863513..22e3aec 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -169,7 +169,8 @@ DEF_GNUTLS_FN (int, gnutls_x509_crt_get_dn,
               (gnutls_x509_crt_t, char *, size_t *));
 DEF_GNUTLS_FN (int, gnutls_x509_crt_get_pk_algorithm,
               (gnutls_x509_crt_t, unsigned int *));
-DEF_GNUTLS_FN (int, gnutls_pk_algorithm_get_name, (gnutls_pk_algorithm_t));
+DEF_GNUTLS_FN (const char*, gnutls_pk_algorithm_get_name,
+              (gnutls_pk_algorithm_t));
 DEF_GNUTLS_FN (int, gnutls_pk_bits_to_sec_param,
               (gnutls_pk_algorithm_t, unsigned int));
 DEF_GNUTLS_FN (int, gnutls_x509_crt_get_issuer_unique_id,