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/or/router.h | |
| parent | 5f3010667d9473d5c246ff77d6dc3d0ad4c4f30a (diff) | |
| parent | 03adb8caadb894a7fcd7c7a24e3147fa6d3fc4f9 (diff) | |
| download | tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.tar tor-1587735c90f62799e34bc30b1a99eaef6b67dbaa.tar.gz | |
Merge branch 'bug988-nm' into maint-0.2.2
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 c17fc78bd..c5e7987dd 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); |