From: Lars Magne Ingebrigtsen Date: Mon, 8 Dec 2014 19:09:31 +0000 (+0100) Subject: * src/gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits. X-Git-Tag: emacs-25.0.90~2635^2~156 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7c6750264774350e6182aef39793554d4342d439;p=emacs.git * src/gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits. --- diff --git a/src/ChangeLog b/src/ChangeLog index e4ba2c9d6b6..64d8052014f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -8,6 +8,8 @@ (gnutls_certificate_details): Put :signature-algorithm back again, which was removed by mistake. + * gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits. + 2014-12-07 Jan Djärv * nsimage.m (setPixmapData): Make bmRep local so class member is not diff --git a/src/gnutls.c b/src/gnutls.c index 3893f4d3dfa..9ddc8e1e201 100644 --- a/src/gnutls.c +++ b/src/gnutls.c @@ -115,6 +115,7 @@ DEF_GNUTLS_FN (int, gnutls_credentials_set, DEF_GNUTLS_FN (void, gnutls_deinit, (gnutls_session_t)); DEF_GNUTLS_FN (void, gnutls_dh_set_prime_bits, (gnutls_session_t, unsigned int)); +DEF_GNUTLS_FN (int, gnutls_dh_get_prime_bits, (gnutls_session_t)); DEF_GNUTLS_FN (int, gnutls_error_is_fatal, (int)); DEF_GNUTLS_FN (int, gnutls_global_init, (void)); DEF_GNUTLS_FN (void, gnutls_global_set_log_function, (gnutls_log_func)); @@ -221,6 +222,7 @@ init_gnutls_functions (void) LOAD_GNUTLS_FN (library, gnutls_credentials_set); LOAD_GNUTLS_FN (library, gnutls_deinit); LOAD_GNUTLS_FN (library, gnutls_dh_set_prime_bits); + LOAD_GNUTLS_FN (library, gnutls_dh_get_prime_bits); LOAD_GNUTLS_FN (library, gnutls_error_is_fatal); LOAD_GNUTLS_FN (library, gnutls_global_init); LOAD_GNUTLS_FN (library, gnutls_global_set_log_function); @@ -299,6 +301,7 @@ init_gnutls_functions (void) #define fn_gnutls_credentials_set gnutls_credentials_set #define fn_gnutls_deinit gnutls_deinit #define fn_gnutls_dh_set_prime_bits gnutls_dh_set_prime_bits +#define fn_gnutls_dh_get_prime_bits gnutls_dh_get_prime_bits #define fn_gnutls_error_is_fatal gnutls_error_is_fatal #define fn_gnutls_global_init gnutls_global_init #define fn_gnutls_global_set_log_function gnutls_global_set_log_function @@ -1041,7 +1044,7 @@ The return value is a property list with top-level keys :warnings and /* Diffie-Hellman prime bits. */ { - int bits = gnutls_dh_get_prime_bits (XPROCESS (proc)->gnutls_state); + int bits = fn_gnutls_dh_get_prime_bits (XPROCESS (proc)->gnutls_state); if (bits > 0) result = nconc2 (result, list2 (intern (":diffie-hellman-prime-bits"),