Make sure all reads/writes to gnutls streams go via the gnutls functions.

2 files changed, 9 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 655e4d1b240..44cb82b4c7b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-29  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/gnutls.el (starttls-negotiate): Loop a lot longer.
+
 2010-09-29  Glenn Morris  <rgm@gnu.org>
 
         * calendar/diary-lib.el (diary-list-entries): Use temp buffers when
diff --git a/lisp/net/gnutls.el b/lisp/net/gnutls.el
index 6a2d5aff68f..e1d093ebf79 100644
--- a/lisp/net/gnutls.el
+++ b/lisp/net/gnutls.el
@@ -37,7 +37,7 @@
   :prefix "gnutls-"
   :group 'net-utils)
 
-(defcustom gnutls-log-level 2
+(defcustom gnutls-log-level 0
   "Logging level to be used by `starttls-negotiate' and GnuTLS."
   :type 'integer
   :group 'gnutls)
@@ -91,20 +91,14 @@ CREDENTIALS-FILE is a filename with meaning dependent on CREDENTIALS."
       (error "Could not boot GnuTLS for this process"));
 
     (let ((ret 'gnutls-e-again)
-          (n 25000))
+          (n 250000))
       (while (and (not (eq ret t))
                   (not (gnutls-error-fatalp ret))
                   (> n 0))
         (setq n (1- n))
-        (setq ret (gnutls-handshake proc))
-        )
-      (if (gnutls-errorp ret)
-          (progn
-            (message "Ouch, error return %s (%s)"
-                     ret (gnutls-error-string ret))
-            (setq proc nil))
-        (message "Handshake complete %s." ret)))
-     proc))
+        (setq ret (gnutls-handshake proc)))
+      (message "Handshake complete %s." ret))
+    proc))
 
 (defun starttls-open-stream (name buffer host service)
   "Open a TLS connection for a service to a host.