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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e503a6e31944f92868c990df4989c8cffa291b8f..34ac2d31c4bacc232196dc0065a2dd3d9928eb74 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * 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 f18565a6212f33528c7f8f4b0e6d74a8afd210cb..a3ce96c66219dcd9ccc4e939d002b3e10d20f25c 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-23  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * pop3.el (pop3-open-server): Warn unless encrypted.
+
+       * nnimap.el (nnimap-open-connection-1): Warn unless encrypted.
+
 2014-11-17  Albert Krewinkel  <albert@zeitkraut.de>
 
        * message.el (message-valid-fqdn-regexp): Add non-internaional new

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 799215190e040c3afdecf7729fff56c8315ad301..45d10dd8a83609b9f17c76580298322aa8902f19 100644 (file)
--- 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 dfc646b5e74744e4f73c04c2c6e609193bc9da29..64a704f610688ff3172bd92dacdeb35e575652a0 100644 (file)
--- 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 3440741f573b15635a9e6e8a17d196b5b7bf1120..e70499f222ab0068818dc2356ecc86be88f3c35d 100644 (file)
--- 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"