nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix some wide lines in tortls.c"

Browse Source 
This reverts commit e8dde3aabd.
This commit is contained in:
Nick Mathewson 2011-12-06 19:49:20 -05:00
parent e83e720c8b
commit 17880e4c0a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/tortls.c
View File

@ -1343,8 +1343,7 @@ tor_tls_got_client_hello(tor_tls_t *tls)
if (tor_run_in_libevent_loop(tls->excess_renegotiations_callback, if (tor_run_in_libevent_loop(tls->excess_renegotiations_callback,
tls->callback_arg) < 0) { tls->callback_arg) < 0) {
log_warn(LD_GENERAL, "Didn't manage to set a renegotiation " log_warn(LD_GENERAL, "Didn't manage to set a renegotiation limiting callback.");
"limiting callback.");
} }
} }
@ -1399,6 +1398,7 @@ tor_tls_state_changed_callback(const SSL *ssl, int type, int val)
tor_tls_got_client_hello(tls); tor_tls_got_client_hello(tls);
} }
#endif #endif
} }
/** Replace *<b>ciphers</b> with a new list of SSL ciphersuites: specifically, /** Replace *<b>ciphers</b> with a new list of SSL ciphersuites: specifically,
@ -1666,8 +1666,8 @@ tor_tls_read(tor_tls_t *tls, char *cp, size_t len)
#ifdef V2_HANDSHAKE_SERVER #ifdef V2_HANDSHAKE_SERVER
if (tls->got_renegotiate) { if (tls->got_renegotiate) {
if (tls->server_handshake_count != 2) { if (tls->server_handshake_count != 2) {
log_warn(LD_BUG, "We did not notice renegotiation in a timely " log_warn(LD_BUG, "We did not notice renegotiation in a timely fashion (%u)!",
"fashion (%u)!", tls->server_handshake_count); tls->server_handshake_count);
} }
/* Renegotiation happened! */ /* Renegotiation happened! */