Add a variable to customize the gnutls priority

3 files changed, 15 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f99f2692bad..114a318fe96 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -7,6 +7,9 @@
 
 2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+	* net/gnutls.el (gnutls-algorithm-priority): New variable.
+	(gnutls-negotiate): Use it.
+
 	* emacs-lisp/cl-macs.el (declare): Link to the "Declarations" node.
 
 	* info.el (Info-beginning-of-buffer): New command.
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 1c766afc8db..f0c72a0b269 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "dd99db1e96dff411cc5d484a639a1330")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" "2261724608e3223036b863d214f7dc0c")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\
@@ -541,12 +541,13 @@ values.  For compatibility, (values A B C) is a synonym for (list A B C).
 \(fn TYPE FORM)" nil (quote macro))
 
 (autoload 'declare "cl-macs" "\
-Declare something about SPECS while compiling.
+Declare SPECS about the current function while compiling.
 For instance
 
   (declare (warn 0))
 
-will turn off byte-compile warnings.
+will turn off byte-compile warnings in the function.
+See Info node `(cl)Declarations' for details.
 
 \(fn &rest SPECS)" nil (quote macro))
 
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 67d7b2d20d3..f0bc8dec09d 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -47,6 +47,13 @@
   :type 'integer
   :group 'gnutls)
 
+(defcustom gnutls-algorithm-priority nil
+  "If non-nil, this should be a TLS priority string.
+For instance, if you want to skip the \"dhe-rsa\" algorithm,
+set this variable to \"normal:-dhe-rsa\"."
+  :type '(choice (const nil)
+		 string))
+
 (defun open-gnutls-stream (name buffer host service)
   "Open a SSL/TLS connection for a service to a host.
 Returns a subprocess-object to represent the connection.
@@ -145,7 +152,7 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                                ((eq type 'gnutls-anon)
                                 "NORMAL:+ANON-DH:!ARCFOUR-128")
                                ((eq type 'gnutls-x509pki)
-                                "NORMAL"))))
+                                (or gnutls-algorithm-priority "NORMAL")))))
          (params `(:priority ,priority-string
                              :hostname ,hostname
                              :loglevel ,gnutls-log-level