Commit 6c854f07 authored by Ted Zlatanov's avatar Ted Zlatanov
Browse files

net/gnutls.el: pass correct data to `gnutls-boot'.

* net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
correct data to `gnutls-boot'.
Reported by Toke Høiland-Jørgensen <toke@toke.dk>.
parent 427c3627
2014-10-18 Teodor Zlatanov <tzz@lifelogs.com>
* net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass
correct data to `gnutls-boot' (Bug#18664).
Reported by Toke Høiland-Jørgensen <toke@toke.dk>.
2014-10-18 Michal Nazarewicz <mina86@mina86.com> 2014-10-18 Michal Nazarewicz <mina86@mina86.com>
   
* whitespace.el (whitespace-style, whitespace-big-indent) * whitespace.el (whitespace-style, whitespace-big-indent)
......
...@@ -211,11 +211,13 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." ...@@ -211,11 +211,13 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT."
t) t)
;; if a list, look for hostname matches ;; if a list, look for hostname matches
((listp gnutls-verify-error) ((listp gnutls-verify-error)
(cl-mapcan (apply 'append
(lambda (check) (mapcar
(when (string-match (car check) hostname) (lambda (check)
(copy-sequence (cdr check)))) (when (string-match (nth 0 check)
gnutls-verify-error)) hostname)
(nth 1 check)))
gnutls-verify-error)))
;; else it's nil ;; else it's nil
(t nil)))) (t nil))))
(min-prime-bits (or min-prime-bits gnutls-min-prime-bits)) (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment