diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-15 19:25:02 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2011-07-15 19:25:02 +0200 |
| commit | d6066239555e3ef3fcda8481ce9f9288676b1bd8 (patch) | |
| tree | 841d92a18a9aaa6d198ed5d090ed05fbca6deaeb | |
| parent | 7b41decb8ee56d61ace1637138a38b89bcf09eb4 (diff) | |
| download | emacs-d6066239555e3ef3fcda8481ce9f9288676b1bd8.tar.gz | |
* net/gnutls.el (gnutls-negotiate): Upcase `gnutls-algorithm-priority'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 114a318fe96..87f5cc9d70d 100644 --- 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 f0bc8dec09d..14d4a2f28e6 100644 --- 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 |