aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-12-08 20:09:31 +0100
committerLars Magne Ingebrigtsen2014-12-08 20:09:31 +0100
commit7c6750264774350e6182aef39793554d4342d439 (patch)
treedfef5ec930f1461b2aa2caa420820f824642ffc1 /src
parent6b1ab80ef9b65c08e53edc7fa8ec4418da296ca7 (diff)
downloademacs-7c6750264774350e6182aef39793554d4342d439.tar.gz
emacs-7c6750264774350e6182aef39793554d4342d439.zip
* src/gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e4ba2c9d6b6..64d8052014f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -8,6 +8,8 @@
8 (gnutls_certificate_details): Put :signature-algorithm back again, 8 (gnutls_certificate_details): Put :signature-algorithm back again,
9 which was removed by mistake. 9 which was removed by mistake.
10 10
11 * gnutls.c: Add Windows specs for gnutls_dh_get_prime_bits.
12
112014-12-07 Jan Djärv <jan.h.d@swipnet.se> 132014-12-07 Jan Djärv <jan.h.d@swipnet.se>
12 14
13 * nsimage.m (setPixmapData): Make bmRep local so class member is not 15 * 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,
115DEF_GNUTLS_FN (void, gnutls_deinit, (gnutls_session_t)); 115DEF_GNUTLS_FN (void, gnutls_deinit, (gnutls_session_t));
116DEF_GNUTLS_FN (void, gnutls_dh_set_prime_bits, 116DEF_GNUTLS_FN (void, gnutls_dh_set_prime_bits,
117 (gnutls_session_t, unsigned int)); 117 (gnutls_session_t, unsigned int));
118DEF_GNUTLS_FN (int, gnutls_dh_get_prime_bits, (gnutls_session_t));
118DEF_GNUTLS_FN (int, gnutls_error_is_fatal, (int)); 119DEF_GNUTLS_FN (int, gnutls_error_is_fatal, (int));
119DEF_GNUTLS_FN (int, gnutls_global_init, (void)); 120DEF_GNUTLS_FN (int, gnutls_global_init, (void));
120DEF_GNUTLS_FN (void, gnutls_global_set_log_function, (gnutls_log_func)); 121DEF_GNUTLS_FN (void, gnutls_global_set_log_function, (gnutls_log_func));
@@ -221,6 +222,7 @@ init_gnutls_functions (void)
221 LOAD_GNUTLS_FN (library, gnutls_credentials_set); 222 LOAD_GNUTLS_FN (library, gnutls_credentials_set);
222 LOAD_GNUTLS_FN (library, gnutls_deinit); 223 LOAD_GNUTLS_FN (library, gnutls_deinit);
223 LOAD_GNUTLS_FN (library, gnutls_dh_set_prime_bits); 224 LOAD_GNUTLS_FN (library, gnutls_dh_set_prime_bits);
225 LOAD_GNUTLS_FN (library, gnutls_dh_get_prime_bits);
224 LOAD_GNUTLS_FN (library, gnutls_error_is_fatal); 226 LOAD_GNUTLS_FN (library, gnutls_error_is_fatal);
225 LOAD_GNUTLS_FN (library, gnutls_global_init); 227 LOAD_GNUTLS_FN (library, gnutls_global_init);
226 LOAD_GNUTLS_FN (library, gnutls_global_set_log_function); 228 LOAD_GNUTLS_FN (library, gnutls_global_set_log_function);
@@ -299,6 +301,7 @@ init_gnutls_functions (void)
299#define fn_gnutls_credentials_set gnutls_credentials_set 301#define fn_gnutls_credentials_set gnutls_credentials_set
300#define fn_gnutls_deinit gnutls_deinit 302#define fn_gnutls_deinit gnutls_deinit
301#define fn_gnutls_dh_set_prime_bits gnutls_dh_set_prime_bits 303#define fn_gnutls_dh_set_prime_bits gnutls_dh_set_prime_bits
304#define fn_gnutls_dh_get_prime_bits gnutls_dh_get_prime_bits
302#define fn_gnutls_error_is_fatal gnutls_error_is_fatal 305#define fn_gnutls_error_is_fatal gnutls_error_is_fatal
303#define fn_gnutls_global_init gnutls_global_init 306#define fn_gnutls_global_init gnutls_global_init
304#define fn_gnutls_global_set_log_function gnutls_global_set_log_function 307#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
1041 1044
1042 /* Diffie-Hellman prime bits. */ 1045 /* Diffie-Hellman prime bits. */
1043 { 1046 {
1044 int bits = gnutls_dh_get_prime_bits (XPROCESS (proc)->gnutls_state); 1047 int bits = fn_gnutls_dh_get_prime_bits (XPROCESS (proc)->gnutls_state);
1045 if (bits > 0) 1048 if (bits > 0)
1046 result = nconc2 (result, list2 1049 result = nconc2 (result, list2
1047 (intern (":diffie-hellman-prime-bits"), 1050 (intern (":diffie-hellman-prime-bits"),