diff options
| author | Robert Pluim | 2018-04-13 14:24:11 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2018-04-13 14:24:11 +0200 |
| commit | d5cf7330fa72a81b779628c14a0a19f3fc180f22 (patch) | |
| tree | 8bcac0a4488c95845ed10d4f8b5f59b2df6f4dcb /lisp | |
| parent | feb5b442f7c2db738b9c94069600c309061bc5b0 (diff) | |
| download | emacs-d5cf7330fa72a81b779628c14a0a19f3fc180f22.tar.gz emacs-d5cf7330fa72a81b779628c14a0a19f3fc180f22.zip | |
Change gnutls-verify-error to be first-match
* lisp/net/gnutls.el (gnutls-boot-parameters): Convert to
first-match for gnutls-verify-error rather than any-match
(bug#29977).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/net/gnutls.el | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index 85c9308c0d2..cce4962758d 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el | |||
| @@ -282,13 +282,9 @@ defaults to GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT." | |||
| 282 | t) | 282 | t) |
| 283 | ;; if a list, look for hostname matches | 283 | ;; if a list, look for hostname matches |
| 284 | ((listp gnutls-verify-error) | 284 | ((listp gnutls-verify-error) |
| 285 | (apply 'append | 285 | (cadr (cl-find-if #'(lambda (x) |
| 286 | (mapcar | 286 | (string-match (car x) hostname)) |
| 287 | (lambda (check) | 287 | gnutls-verify-error))) |
| 288 | (when (string-match (nth 0 check) | ||
| 289 | hostname) | ||
| 290 | (nth 1 check))) | ||
| 291 | gnutls-verify-error))) | ||
| 292 | ;; else it's nil | 288 | ;; else it's nil |
| 293 | (t nil)))) | 289 | (t nil)))) |
| 294 | (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))) | 290 | (min-prime-bits (or min-prime-bits gnutls-min-prime-bits))) |