Refactor gnutls-algorithm-priority

And prevent void-variable error if gnutls is, for some reason,
unavailable or libgnutls-version isn't a numeric.
This commit is contained in:
Henrik Lissner 2020-03-27 21:30:07 -04:00
parent be257140b4
commit 6c4081f785
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -191,8 +191,9 @@ users).")
;; least a little more discerning. ;; least a little more discerning.
(setq gnutls-verify-error (not (getenv "INSECURE")) (setq gnutls-verify-error (not (getenv "INSECURE"))
gnutls-algorithm-priority gnutls-algorithm-priority
(let ((support-tls1.3 (if (>= libgnutls-version 30605) ":+VERS-TLS1.3" nil))) (concat "SECURE128:+SECURE192:-VERS-ALL:+VERS-TLS1.2"
(concat "SECURE128:+SECURE192:-VERS-ALL:+VERS-TLS1.2" support-tls1.3)) (if (ignore-errors (>= libgnutls-version 30605))
":+VERS-TLS1.3"))
;; `gnutls-min-prime-bits' is set based on recommendations from ;; `gnutls-min-prime-bits' is set based on recommendations from
;; https://www.keylength.com/en/4/ ;; https://www.keylength.com/en/4/
gnutls-min-prime-bits 3072 gnutls-min-prime-bits 3072