[or-cvs] Backport tor_tls_handshake fix.

[Nick Mathewson]

Update of /home/or/cvsroot/tor/src/common
In directory moria.mit.edu:/tmp/cvs-serv17360/src/common

Modified Files:
      Tag: tor-0_0_9-patches
	tortls.c 
Log Message:
Backport tor_tls_handshake fix.

Index: tortls.c
===================================================================
RCS file: /home/or/cvsroot/tor/src/common/tortls.c,v
retrieving revision 1.82.2.2
retrieving revision 1.82.2.3
diff -u -d -r1.82.2.2 -r1.82.2.3
--- tortls.c	23 Apr 2005 14:35:13 -0000	1.82.2.2
+++ tortls.c	23 Apr 2005 20:36:19 -0000	1.82.2.3
@@ -500,12 +500,17 @@
   tor_assert(tls);
   tor_assert(tls->ssl);
   tor_assert(tls->state == TOR_TLS_ST_HANDSHAKE);
+  check_no_tls_errors();
   if (tls->isServer) {
     r = SSL_accept(tls->ssl);
   } else {
     r = SSL_connect(tls->ssl);
   }
   r = tor_tls_get_error(tls,r,0, "handshaking", LOG_INFO);
+  if (ERR_peek_error() != 0) {
+    tls_log_errors(LOG_WARN, "handshaking");
+    return TOR_TLS_ERROR;
+  }
   if (r == TOR_TLS_DONE) {
     tls->state = TOR_TLS_ST_OPEN;
   }