diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-18 14:53:41 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-18 14:53:41 +0000 |
| commit | 05f5d778a23b0e5e6abd256e59af3046ae9d9efa (patch) | |
| tree | c02cb0272328ee8e97762ea961ad8692fbd54626 /src/common | |
| parent | ba915e421104089437ccbff6d2cab5dcf07ea99c (diff) | |
| download | tor-05f5d778a23b0e5e6abd256e59af3046ae9d9efa.tar.gz tor-05f5d778a23b0e5e6abd256e59af3046ae9d9efa.zip | |
r18919@catbus: nickm | 2008-03-18 10:53:38 -0400
Forward-port bug 622 fix as diagnosed by lodger.
svn:r14096
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tortls.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 1352f79533..fb5fb7ee1a 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -992,8 +992,7 @@ tor_tls_renegotiate(tor_tls_t *tls) if (tls->state != TOR_TLS_ST_RENEGOTIATE) { int r = SSL_renegotiate(tls->ssl); if (r <= 0) { - return tor_tls_get_error(tls, r, CATCH_SYSCALL|CATCH_ZERO, - "renegotiating", LOG_WARN); + return tor_tls_get_error(tls, r, 0, "renegotiating", LOG_WARN); } tls->state = TOR_TLS_ST_RENEGOTIATE; } @@ -1002,8 +1001,7 @@ tor_tls_renegotiate(tor_tls_t *tls) tls->state = TOR_TLS_ST_OPEN; return TOR_TLS_DONE; } else - return tor_tls_get_error(tls, r, CATCH_SYSCALL|CATCH_ZERO, - "renegotiating handshake", LOG_INFO); + return tor_tls_get_error(tls, r, 0, "renegotiating handshake", LOG_INFO); } /** Shut down an open tls connection <b>tls</b>. When finished, returns |