diff options
author | Roger Dingledine <arma@torproject.org> | 2003-09-28 06:47:29 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2003-09-28 06:47:29 +0000 |
commit | 677707433e562eec675d5e6e487a008364ebea5b (patch) | |
tree | 4792768667e8ffd1d735e9604405645c1a19ac0d /src/common/tortls.c | |
parent | 0e0169d6fa280f94f5e3f38a8d67b1cdb6452517 (diff) | |
download | tor-677707433e562eec675d5e6e487a008364ebea5b.tar.gz tor-677707433e562eec675d5e6e487a008364ebea5b.zip |
shift read_file_to_str() into util.c
svn:r504
Diffstat (limited to 'src/common/tortls.c')
-rw-r--r-- | src/common/tortls.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index 6fb6a2eaeb..e8e2dc3cc8 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -78,6 +78,7 @@ tor_tls_get_error(tor_tls *tls, int r, int extra, case SSL_ERROR_SYSCALL: if (extra&CATCH_SYSCALL) return _TOR_TLS_SYSCALL; + assert(severity != LOG_ERR); /* XXX remove me when the bug is found */ log(severity, "TLS error: <syscall error>."); return TOR_TLS_ERROR; case SSL_ERROR_ZERO_RETURN: @@ -485,7 +486,7 @@ tor_tls_verify(tor_tls *tls) } int -tor_tls_get_pending_bytees(tor_tls *tls) +tor_tls_get_pending_bytes(tor_tls *tls) { assert(tls); return SSL_pending(tls->ssl); |