diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-25 17:00:47 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-25 17:00:47 -0500 |
| commit | e5f2f10844dc2445f8cf2f0dc8ec92bc4ce65d63 (patch) | |
| tree | fae7b809f8c8470921c1b38be572e231b0af7709 /src/common/tortls.h | |
| parent | b1bd30c24c4d9ee1a760c0fb28e18bc597bb0df5 (diff) | |
| parent | 406ae1ba5ad529a4d0e710229dab6ed645d42b50 (diff) | |
| download | tor-e5f2f10844dc2445f8cf2f0dc8ec92bc4ce65d63.tar.gz tor-e5f2f10844dc2445f8cf2f0dc8ec92bc4ce65d63.zip | |
Merge remote-tracking branch 'asn/bug4312'
Diffstat (limited to 'src/common/tortls.h')
| -rw-r--r-- | src/common/tortls.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h index 673f18dfe8..5874881989 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -13,6 +13,7 @@ #include "crypto.h" #include "compat.h" +#include "compat_libevent.h" /* Opaque structure to hold a TLS connection. */ typedef struct tor_tls_t tor_tls_t; @@ -60,8 +61,9 @@ int tor_tls_context_init(int is_public_server, unsigned int key_lifetime); tor_tls_t *tor_tls_new(int sock, int is_server); void tor_tls_set_logged_address(tor_tls_t *tls, const char *address); -void tor_tls_set_renegotiate_callback(tor_tls_t *tls, +void tor_tls_set_renegotiate_callbacks(tor_tls_t *tls, void (*cb)(tor_tls_t *, void *arg), + void (*cb2)(evutil_socket_t, short, void *), void *arg); int tor_tls_is_server(tor_tls_t *tls); void tor_tls_free(tor_tls_t *tls); @@ -77,7 +79,6 @@ int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); int tor_tls_renegotiate(tor_tls_t *tls); void tor_tls_unblock_renegotiation(tor_tls_t *tls); -void tor_tls_block_renegotiation(tor_tls_t *tls); void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls); int tor_tls_shutdown(tor_tls_t *tls); int tor_tls_get_pending_bytes(tor_tls_t *tls); |