* net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 114a318fe96ec9598aee5592563102e6a4f1d91c..87f5cc9d70db8023814bce471f7237416e014963 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * net/gnutls.el (gnutls-negotiate): Upcase
+       `gnutls-algorithm-priority'.
+
 2011-07-15  Glenn Morris  <rgm@gnu.org>
 
        * jka-compr.el (jka-compr-verbose): Move from here...

diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index f0bc8dec09d4b85be3c21f1708e6139c1ee3e031..14d4a2f28e6388d7064765d89dbb5f243bf6be65 100644 (file)
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -152,7 +152,9 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
                                ((eq type 'gnutls-anon)
                                 "NORMAL:+ANON-DH:!ARCFOUR-128")
                                ((eq type 'gnutls-x509pki)
-                                (or gnutls-algorithm-priority "NORMAL")))))
+                               (if gnutls-algorithm-priority
+                                   (upcase gnutls-algorithm-priority)
+                                 "NORMAL")))))
          (params `(:priority ,priority-string
                              :hostname ,hostname
                              :loglevel ,gnutls-log-level