diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:23:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-10-21 16:23:01 -0400 |
| commit | 17fdde3d9251e92f01be839efe7fc7cac4854484 (patch) | |
| tree | f22d97b3a46d499dc40c9b958afa1e634909ea55 /src/common/tortls.h | |
| parent | f3eb2a10ae432eb0907418ff69b5e9535b3c7970 (diff) | |
| parent | 441241c13692051ff1b4ae86eaf472a8782cd5d6 (diff) | |
| download | tor-17fdde3d9251e92f01be839efe7fc7cac4854484.tar.gz tor-17fdde3d9251e92f01be839efe7fc7cac4854484.zip | |
Merge remote branch 'origin/maint-0.2.2'
Conflicts:
src/common/tortls.c
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 c1de456611..50d14da52f 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, |