diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-03-17 11:16:24 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-03-17 11:16:24 -0400 |
commit | 58680d04299ab69ea99ee86c5f1a194f44fc1d12 (patch) | |
tree | 814c4ebcbd458585695ec1d3e66c7c78a93e77ff /src/or/router.h | |
parent | 6657fe1e54743e90e33c453de154343fbf94bad4 (diff) | |
parent | 946ccf3e4de883b98aa62666b8a5bdc3eb535447 (diff) | |
download | tor-58680d04299ab69ea99ee86c5f1a194f44fc1d12.tar.gz tor-58680d04299ab69ea99ee86c5f1a194f44fc1d12.zip |
Merge branch 'ahf_bugs_21641_squashed'
Diffstat (limited to 'src/or/router.h')
-rw-r--r-- | src/or/router.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/or/router.h b/src/or/router.h index 0c5425501e..9c5def5218 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -27,10 +27,13 @@ crypto_pk_t *get_my_v3_authority_signing_key(void); authority_cert_t *get_my_v3_legacy_cert(void); crypto_pk_t *get_my_v3_legacy_signing_key(void); void dup_onion_keys(crypto_pk_t **key, crypto_pk_t **last); +void expire_old_onion_keys(void); void rotate_onion_key(void); crypto_pk_t *init_key_from_file(const char *fname, int generate, int severity, int log_greeting); void v3_authority_check_key_expiry(void); +int get_onion_key_lifetime(void); +int get_onion_key_grace_period(void); di_digest256_map_t *construct_ntor_key_map(void); void ntor_key_map_free(di_digest256_map_t *map); |