[Emacs-diffs] /srv/bzr/emacs/emacs-24 r107996: * net/gnutls.el (gnutls-min-prime-bits): Default to 256.

[Chong Yidong]

------------------------------------------------------------
revno: 107996
fixes bug(s): http://debbugs.gnu.org/11267
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-05-15 23:16:13 +0800
message:
  * net/gnutls.el (gnutls-min-prime-bits): Default to 256.
modified:
  lisp/ChangeLog
  lisp/net/gnutls.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-13 09:16:46 +0000
+++ b/lisp/ChangeLog    2012-05-15 15:16:13 +0000
@@ -1,3 +1,7 @@
+2012-05-15  Chong Yidong  <address@hidden>
+
+       * net/gnutls.el (gnutls-min-prime-bits): Default to 256 (Bug#11267).
+
 2012-05-06  Troels Nielsen  <address@hidden>  (tiny change)
 
        * progmodes/compile.el (compilation-internal-error-properties):

=== modified file 'lisp/net/gnutls.el'
--- a/lisp/net/gnutls.el        2012-02-17 13:05:20 +0000
+++ b/lisp/net/gnutls.el        2012-05-15 15:16:13 +0000
@@ -66,14 +66,12 @@
                  (repeat (file :tag "Bundle filename"))))
 
 ;;;###autoload
-(defcustom gnutls-min-prime-bits nil
-  "The minimum number of bits to be used in Diffie-Hellman key exchange.
-
-This sets the minimum accepted size of the key to be used in a
-client-server handshake.  If the server sends a prime with fewer than
-the specified number of bits the handshake will fail.
-
-A value of nil says to use the default gnutls value."
+(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.
+
+A value of nil says to use the default GnuTLS value."
   :type '(choice (const :tag "Use default value" nil)
                  (integer :tag "Number of bits" 512))
   :group 'gnutls)