diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 19:15:40 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 19:15:40 -0500 |
| commit | 8bb23c7def49e5a090d337e56eee8398261d9fb6 (patch) | |
| tree | 38943d424308f6a904a924ab6774b28c5ed78032 /src/common | |
| parent | e718397880e47f7b194c5c05112df37eb0e86371 (diff) | |
| parent | e27a26d568a257cf350814a9abfa47d3b41ad9f3 (diff) | |
| download | tor-8bb23c7def49e5a090d337e56eee8398261d9fb6.tar tor-8bb23c7def49e5a090d337e56eee8398261d9fb6.tar.gz | |
Merge branch 'bug4587_v2'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/tortls.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/common/tortls.c b/src/common/tortls.c index a6947c87d..18f268470 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1573,7 +1573,6 @@ tor_tls_set_renegotiate_callbacks(tor_tls_t *tls, tls->excess_renegotiations_callback = cb2; tls->callback_arg = arg; tls->got_renegotiate = 0; - SSL_set_info_callback(tls->ssl, tor_tls_state_changed_callback); } /** If this version of openssl requires it, turn on renegotiation on @@ -1777,7 +1776,6 @@ tor_tls_finish_handshake(tor_tls_t *tls) { int r = TOR_TLS_DONE; if (tls->isServer) { - SSL_set_info_callback(tls->ssl, NULL); SSL_set_verify(tls->ssl, SSL_VERIFY_PEER, always_accept_verify_cb); /* There doesn't seem to be a clear OpenSSL API to clear mode flags. */ tls->ssl->mode &= ~SSL_MODE_NO_AUTO_CHAIN; |