nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

r14534@catbus: nickm | 2007-08-13 15:15:46 -0400

Browse Source 
Read v3 keys from the right location


svn:r11087
This commit is contained in:
Nick Mathewson 2007-08-13 19:16:44 +00:00
parent ce1f01c3e6
commit 89c65f2a4e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -15,9 +15,12 @@ Changes in version 0.2.0.5-alpha - 2007-??-??
- Store v3 consensus status consensuses on disk, and reload them - Store v3 consensus status consensuses on disk, and reload them
on startup. on startup.
o Minor featuers (security): o Minor features (security):
- Warn about unsafe ControlPort configurations. - Warn about unsafe ControlPort configurations.
o Minor bugfixes (directory voting):
- Read v3 keys from the right location.
Changes in version 0.2.0.4-alpha - 2007-08-01 Changes in version 0.2.0.4-alpha - 2007-08-01
o Major security fixes: o Major security fixes:

8
src/or/router.c
View File

@ -363,6 +363,10 @@ init_keys(void)
return -1; return -1;
} }
/* 1a. Read v3 directory authority key/cert information. */
if (authdir_mode(options) && options->V3AuthoritativeDir)
init_v3_authority_keys(keydir);
/* 1. Read identity key. Make it if none is found. */ /* 1. Read identity key. Make it if none is found. */
tor_snprintf(keydir,sizeof(keydir), tor_snprintf(keydir,sizeof(keydir),
"%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_id_key",datadir); "%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_id_key",datadir);
@ -371,10 +375,6 @@ init_keys(void)
if (!prkey) return -1; if (!prkey) return -1;
set_identity_key(prkey); set_identity_key(prkey);
/* 1b. Read v3 directory authority key/cert information. */
if (authdir_mode(options) && options->V3AuthoritativeDir)
init_v3_authority_keys(keydir);
/* 2. Read onion key. Make it if none is found. */ /* 2. Read onion key. Make it if none is found. */
tor_snprintf(keydir,sizeof(keydir), tor_snprintf(keydir,sizeof(keydir),
"%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_onion_key",datadir); "%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_onion_key",datadir);