diff options
| author | Nick Mathewson <nickm@torproject.org> | 2006-09-24 17:20:41 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2006-09-24 17:20:41 +0000 |
| commit | 9006dbeb812168e0eb7ec707a61a7d539b18ecea (patch) | |
| tree | 17eb1979d71a24c99cff0d87f047f3aaa8875c5d /src/common/tortls.h | |
| parent | bf738d30808190fcd20e8bcb3e75b17f7b730105 (diff) | |
| download | tor-9006dbeb812168e0eb7ec707a61a7d539b18ecea.tar.gz tor-9006dbeb812168e0eb7ec707a61a7d539b18ecea.zip | |
Oops. My last commit to the 1.1 branch somehow merged the whole stable branch in. Bad idea. This should revert it.
svn:r8479
Diffstat (limited to 'src/common/tortls.h')
| -rw-r--r-- | src/common/tortls.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/tortls.h b/src/common/tortls.h index 2569abf79c..82a64cb97a 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -26,9 +26,9 @@ typedef struct tor_tls_t tor_tls_t; #define TOR_TLS_DONE 0 void tor_tls_free_all(void); -int tor_tls_context_new(crypto_pk_env_t *rsa, +int tor_tls_context_new(crypto_pk_env_t *rsa, int isServer, const char *nickname, unsigned int key_lifetime); -tor_tls_t *tor_tls_new(int sock, int is_server); +tor_tls_t *tor_tls_new(int sock, int is_server, int use_no_cert); int tor_tls_is_server(tor_tls_t *tls); void tor_tls_free(tor_tls_t *tls); int tor_tls_peer_has_cert(tor_tls_t *tls); |