From c43b706ab3a699c107a91d1ab6f16014fff65b54 Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 23 Nov 2014 15:00:48 +0100 Subject: [PATCH] Make some network connections warn unless they are encrypted * mail/smtpmail.el (smtpmail-via-smtp): Warn unless encrypted and we're sending a password. * pop3.el (pop3-open-server): Warn unless encrypted. * nnimap.el (nnimap-open-connection-1): Warn unless encrypted. --- lisp/ChangeLog | 3 +++ lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/nnimap.el | 1 + lisp/gnus/pop3.el | 1 + lisp/mail/smtpmail.el | 1 + 5 files changed, 12 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e503a6e3194..34ac2d31c4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-11-23 Lars Magne Ingebrigtsen + * mail/smtpmail.el (smtpmail-via-smtp): Warn unless encrypted and + we're sending a password. + * net/nsm.el: New file that implements a Network Security Manager. * net/network-stream.el (open-network-stream): Add a new diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f18565a6212..a3ce96c6621 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2014-11-23 Lars Magne Ingebrigtsen + + * pop3.el (pop3-open-server): Warn unless encrypted. + + * nnimap.el (nnimap-open-connection-1): Warn unless encrypted. + 2014-11-17 Albert Krewinkel * message.el (message-valid-fqdn-regexp): Add non-internaional new diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el index 799215190e0..45d10dd8a83 100644 --- a/lisp/gnus/nnimap.el +++ b/lisp/gnus/nnimap.el @@ -405,6 +405,7 @@ textual parts.") "*nnimap*" (current-buffer) nnimap-address (nnimap-map-port (car ports)) :type nnimap-stream + :warn-unless-encrypted t :return-list t :shell-command nnimap-shell-program :capability-command "1 CAPABILITY\r\n" diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el index dfc646b5e74..64a704f6106 100644 --- a/lisp/gnus/pop3.el +++ b/lisp/gnus/pop3.el @@ -561,6 +561,7 @@ Returns the process associated with the connection." 'tls) (t (or pop3-stream-type 'network))) + :warn-unless-encrypted t :capability-command "CAPA\r\n" :end-of-command "^\\(-ERR\\|+OK\\).*\n" :end-of-capability "^\\.\r?\n\\|^-ERR" diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el index 3440741f573..e70499f222a 100644 --- a/lisp/mail/smtpmail.el +++ b/lisp/mail/smtpmail.el @@ -687,6 +687,7 @@ Returns an error if the server cannot be contacted." "smtpmail" process-buffer host port :type smtpmail-stream-type :return-list t + :warn-unless-encrypted ask-for-password :capability-command (format "EHLO %s\r\n" (smtpmail-fqdn)) :end-of-command "^[0-9]+ .*\r\n" :success "^2.*\n" -- 2.39.5