diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:11:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:11:02 -0400 |
| commit | 1587735c90f62799e34bc30b1a99eaef6b67dbaa (patch) | |
| tree | 5e9eb59ace957248248210db49fa5d654b30b4f8 /src/common/tortls.h | |
| parent | 5f3010667d9473d5c246ff77d6dc3d0ad4c4f30a (diff) | |
| parent | 03adb8caadb894a7fcd7c7a24e3147fa6d3fc4f9 (diff) | |
| download | tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.tar.gz tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.zip | |
Merge branch 'bug988-nm' into maint-0.2.2
Diffstat (limited to 'src/common/tortls.h')
| -rw-r--r-- | src/common/tortls.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h index e4b1ad65f2..955027ba35 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -50,7 +50,10 @@ typedef struct tor_tls_t tor_tls_t; const char *tor_tls_err_to_string(int err); void tor_tls_free_all(void); -int tor_tls_context_new(crypto_pk_env_t *rsa, unsigned int key_lifetime); +int tor_tls_context_init(int is_public_server, + crypto_pk_env_t *client_identity, + crypto_pk_env_t *server_identity, + 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, |