aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-12-08 19:48:38 +0100
committerLars Magne Ingebrigtsen2014-12-08 19:48:38 +0100
commita0fe9b0481eb85667e99b987070af13311a95e54 (patch)
treeef5074d24e3a02c6af9e8563fc1b23447647ce38 /src
parentc498441ee63747386e0055717d79b09f6d8a7209 (diff)
downloademacs-a0fe9b0481eb85667e99b987070af13311a95e54.tar.gz
emacs-a0fe9b0481eb85667e99b987070af13311a95e54.zip
(Fgnutls_peer_status): Return the DH prime bits for the connection
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog2
-rw-r--r--src/gnutls.c9
2 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 70b1bb001a9..b791d18bccb 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,6 +3,8 @@
3 * gnutls.c (gnutls_certificate_details): The :signature isn't 3 * gnutls.c (gnutls_certificate_details): The :signature isn't
4 that useful, so remove it. 4 that useful, so remove it.
5 (gnutls_certificate_details): Clean up whitespace slightly. 5 (gnutls_certificate_details): Clean up whitespace slightly.
6 (Fgnutls_peer_status): Return the Diffie-Hellman prime bits for
7 the connection.
6 8
72014-12-07 Jan Djärv <jan.h.d@swipnet.se> 92014-12-07 Jan Djärv <jan.h.d@swipnet.se>
8 10
diff --git a/src/gnutls.c b/src/gnutls.c
index c4d85a2030e..2006bbcef0e 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -1029,6 +1029,15 @@ The return value is a property list with top-level keys :warnings and
1029 (intern (":certificate"), 1029 (intern (":certificate"),
1030 gnutls_certificate_details (XPROCESS (proc)->gnutls_certificate))); 1030 gnutls_certificate_details (XPROCESS (proc)->gnutls_certificate)));
1031 1031
1032 /* Diffie-Hellman prime bits. */
1033 {
1034 int bits = gnutls_dh_get_prime_bits (XPROCESS (proc)->gnutls_state);
1035 if (bits > 0)
1036 result = nconc2 (result, list2
1037 (intern (":diffie-hellman-prime-bits"),
1038 make_number (bits)));
1039 }
1040
1032 return result; 1041 return result;
1033} 1042}
1034 1043