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/or/router.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/or/router.h')
| -rw-r--r-- | src/or/router.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/or/router.h b/src/or/router.h index 13ea6f80e6..41a9f7119c 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -14,9 +14,12 @@ crypto_pk_env_t *get_onion_key(void); time_t get_onion_key_set_at(void); -void set_identity_key(crypto_pk_env_t *k); -crypto_pk_env_t *get_identity_key(void); -int identity_key_is_set(void); +void set_server_identity_key(crypto_pk_env_t *k); +crypto_pk_env_t *get_server_identity_key(void); +int server_identity_key_is_set(void); +void set_client_identity_key(crypto_pk_env_t *k); +crypto_pk_env_t *get_tlsclient_identity_key(void); +int client_identity_key_is_set(void); authority_cert_t *get_my_v3_authority_cert(void); crypto_pk_env_t *get_my_v3_authority_signing_key(void); authority_cert_t *get_my_v3_legacy_cert(void); @@ -48,6 +51,7 @@ int authdir_mode_tests_reachability(or_options_t *options); int authdir_mode_bridge(or_options_t *options); int server_mode(or_options_t *options); +int public_server_mode(or_options_t *options); int advertised_server_mode(void); int proxy_mode(or_options_t *options); void consider_publishable_server(int force); |