diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-29 15:25:24 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2010-09-29 15:25:24 +0200 |
| commit | bac5cef8cc902c7332ef66f6731fa5be0866811c (patch) | |
| tree | 060d740fcae01d8b4c80c76a24d871c24006cdf1 /lisp | |
| parent | df7fcafff05c4002f35e507c65518f4b20ba5382 (diff) | |
| download | emacs-bac5cef8cc902c7332ef66f6731fa5be0866811c.tar.gz | |
Do the gnutls handshake from the reader loop, instead of looping over
the handshake from Emacs Lisp.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/net/gnutls.el | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 44cb82b4c7b..3ca07c33e15 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,8 @@ 2010-09-29 Lars Magne Ingebrigtsen <larsi@gnus.org> * net/gnutls.el (starttls-negotiate): Loop a lot longer. + (starttls-negotiate): Just call boot, and let the handshake be + triggered from the read loop. 2010-09-29 Glenn Morris <rgm@gnu.org> diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el index e1d093ebf79..27d44d32bd3 100644 --- a/lisp/net/gnutls.el +++ b/lisp/net/gnutls.el @@ -87,17 +87,6 @@ CREDENTIALS-FILE is a filename with meaning dependent on CREDENTIALS." nil nil gnutls-log-level)) "boot: %s") - (when (gnutls-errorp ret) - (error "Could not boot GnuTLS for this process")); - - (let ((ret 'gnutls-e-again) - (n 250000)) - (while (and (not (eq ret t)) - (not (gnutls-error-fatalp ret)) - (> n 0)) - (setq n (1- n)) - (setq ret (gnutls-handshake proc))) - (message "Handshake complete %s." ret)) proc)) (defun starttls-open-stream (name buffer host service) |