mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

if we rotate our onion key, publish a new descriptor, and

Browse Source 
die soon after, we want to stick with that onion key when
we restart.


svn:r9121
This commit is contained in:
Roger Dingledine 2006-12-15 07:58:31 +00:00
parent 38bd6837db
commit 0bc0688668
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/dir-spec.txt
View File

@ -205,7 +205,7 @@ $Id$
"onion-key" NL a public key in PEM format
This key is used to encrypt EXTEND cells for this OR. The key MUST be
accepted for at least XXXX hours after any new key is published in a
accepted for at least 1 week after any new key is published in a
subsequent descriptor.
"signing-key" NL a public key in PEM format
@ -257,7 +257,7 @@ $Id$
"eventdns" bool NL
Declare whether this version of Tor is using the newer enhanced
dns logic. Versions of Tor without eventdns SHOULD not be used for
dns logic. Versions of Tor without eventdns SHOULD NOT be used for
reverse hostname lookups.
[All versions of Tor before 0.1.2.2-alpha should be assumed to have
@ -431,8 +431,7 @@ $Id$
blacklisted, and elect not to include them in their network-status lists.
Thus, the network-status list includes all non-blacklisted,
non-expired, non-superseded descriptors for ORs that the directory has
observed at least once to be running.
non-expired, non-superseded descriptors.
4. Directory server operation
@ -506,8 +505,8 @@ $Id$
router. Servers must not discard any descriptor listed by any current
network-status document from any authority. If there is enough space to
store additional descriptors, servers SHOULD try to hold those which
clients are likely download the most. (Currently, this is judged based on
the interval for which each descriptor seemed newest.)
clients are likely to download the most. (Currently, this is judged
based on the interval for which each descriptor seemed newest.)
Authorities SHOULD NOT download descriptors for routers that they would
immediately reject for reasons listed in 3.1.

2
src/or/router.c
View File

@ -154,7 +154,7 @@ rotate_onion_key(void)
state->LastRotatedOnionKey = onionkey_set_at = now;
tor_mutex_release(key_lock);
mark_my_descriptor_dirty();
or_state_mark_dirty(state, now+600);
or_state_mark_dirty(state, 0);
return;
error:
log_warn(LD_GENERAL, "Couldn't rotate onion key.");