aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2010-10-03 22:38:53 -0700
committerSebastian Hahn <sebastian@torproject.org>2011-10-26 14:16:20 +0200
commit59e565e2a258f6ca78273585187ff0ab9052cbe7 (patch)
treed365a32199bcede1027dd435d475abe53368cc1a /src/or/or.h
parent299a78c5fed3447a450cea3d4f686c2140c7aaed (diff)
downloadtor-59e565e2a258f6ca78273585187ff0ab9052cbe7.tar.gz
tor-59e565e2a258f6ca78273585187ff0ab9052cbe7.zip
Maintain separate server and client identity keys when appropriate.
Fixes a bug described in ticket #988. Conflicts: src/or/main.c src/or/router.c
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/or.h b/src/or/or.h
index f40511330a..a594d6f891 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4205,9 +4205,12 @@ int rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
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_client_identity_key(crypto_pk_env_t *k);
+void set_server_identity_key(crypto_pk_env_t *k);
+crypto_pk_env_t *get_client_identity_key(void);
+crypto_pk_env_t *get_server_identity_key(void);
+int client_identity_key_is_set(void);
+int server_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);