From 4a7a614530e7d74318b96de4c210ea9fac9df7bc Mon Sep 17 00:00:00 2001 From: Tim Vaughan Date: Mon, 24 Jun 2019 23:19:11 +0200 Subject: [PATCH] Made auto-disabling of TLS mode optional and non-default. --- elpher.el | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/elpher.el b/elpher.el index 3fb2183..340f9df 100644 --- a/elpher.el +++ b/elpher.el @@ -192,6 +192,13 @@ Otherwise, use the system browser via the BROWSE-URL function." "If non-nil, display current node information in buffer header." :type '(boolean)) +(defcustom elpher-auto-disengage-TLS nil + "If non-nil, automatically disengage TLS following an unsuccessful connection. +While enabling this may seem convenient, it is also potentially dangerous as it +allows switching from an encrypted channel back to plain text without user input." + :type '(boolean)) + + ;;; Model ;; @@ -496,9 +503,11 @@ up to the calling function." (error (if (and (consp the-error) (eq (car the-error) 'gnutls-error) - (not (elpher-address-use-tls-p address))) + (not (elpher-address-use-tls-p address)) + (or elpher-auto-disengage-TLS + (yes-or-no-p "Could not establish encrypted connection. Disable TLS mode? "))) (progn - (message "Could not establish TLS connection. Disengaging TLS mode.") + (message "Disengaging TLS mode.") (setq elpher-use-tls nil) (elpher-get-selector address after)) (elpher-process-cleanup) -- 2.20.1