* gnutls.c: Fix Windows function definition of gnutls_x509_crt_get_fingerprint.

diff --git a/src/ChangeLog b/src/ChangeLog
index 8cd0fd9d594caf1ace92f34cfbbff88158aec51a..b7c9a957d22e6f76469396e7ae7a7f761c2bc9ce 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,10 @@
 2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
-       * 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 7863513cce1e12fd6ff5c2d90f9cde7647fc3d99..22e3aec0c21a3e90f6b8b7d44b9ea209a0c33bcd 100644 (file)
--- 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,