* net/gnutls.el (gnutls-min-prime-bits): Improve docstring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4428860cb3bb6f0cd1727daada42bd1ddd31451..9a668fa2704324ef0c84d4d419836dbc8777d149 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-05-16  Chong Yidong  <cyd@gnu.org>
+
+       * net/gnutls.el (gnutls-min-prime-bits): Improve docstring.
+
 2012-05-15  Chong Yidong  <cyd@gnu.org>
 
        * help.el (describe-mode): Doc fix.

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 92400730f56b8d8a32956685f0f7c848bb8e8fbf..a306384c7752b129ca7340f4e332add8c395a9dd 100644 (file)
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -67,9 +67,13 @@ The files may not exist, in which case they will be ignored."
 
 ;;;###autoload
 (defcustom gnutls-min-prime-bits 256
-  "Minimum number of bits to be used in Diffie-Hellman key exchange.
-During a client-server handshake, if the server sends a prime
-with fewer than this number of bits, the handshake will fail.
+  ;; Several mail servers send fewer bits than the GnuTLS default.
+  ;; Currently, 256 appears to be a reasonable choice (Bug#11267).
+  "Minimum number of prime bits accepted by GnuTLS for key exchange.
+During a Diffie-Hellman handshake, if the server sends a prime
+number with fewer than this number of bits, the handshake is
+rejected.  \(The smaller the prime number, the less secure the
+key exchange is against man-in-the-middle attacks.)
 
 A value of nil says to use the default GnuTLS value."
   :type '(choice (const :tag "Use default value" nil)