andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

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

Fixes: debbugs:13706
This commit is contained in:
Didier Verna 2013-02-15 18:45:24 -08:00 • committed by Glenn Morris
parent a7727d05be
commit e5b246e9f3
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
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.

5
lisp/net/network-stream.el
View file

@ -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)))