Commit e5b246e9 authored by Didier Verna's avatar Didier Verna Committed by Glenn Morris
Browse files

* lisp/net/network-stream.el (network-stream-open-starttls):

Check that response to the starttls-command is non-nil.

Fixes: debbugs:13706
parent a7727d05
2013-02-16 Didier Verna <didier@didierverna.net>
* net/network-stream.el (network-stream-open-starttls):
Check that response to the starttls-command is non-nil. (Bug#13706)
2013-02-14 Glenn Morris <rgm@gnu.org>
 
* emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix.
......
......@@ -262,8 +262,9 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
;; EHLO for SMTP.
(when (plist-get parameters :always-query-capabilities)
(network-stream-command stream capability-command eo-capa)))
(when (string-match success-string
(network-stream-command stream starttls-command eoc))
(when (let ((response
(network-stream-command stream starttls-command eoc)))
(and response (string-match success-string response)))
;; The server said it was OK to begin STARTTLS negotiations.
(if builtin-starttls
(let ((cert (network-stream-certificate host service parameters)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment