The Lambda Lab
/
projects
/
elpher.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7a1ad18
)
Made auto-disabling of TLS mode optional and non-default.
author
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 24 Jun 2019 21:19:11 +0000
(23:19 +0200)
committer
Tim Vaughan
<tgvaughan@gmail.com>
Mon, 24 Jun 2019 21:19:11 +0000
(23:19 +0200)
elpher.el
patch
|
blob
|
history
diff --git
a/elpher.el
b/elpher.el
index
3fb2183
..
340f9df
100644
(file)
--- 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))
"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
;;
;;; Model
;;
@@
-496,9
+503,11
@@
up to the calling function."
(error
(if (and (consp the-error)
(eq (car the-error) 'gnutls-error)
(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
(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)
(setq elpher-use-tls nil)
(elpher-get-selector address after))
(elpher-process-cleanup)