diff options
| author | Nick Mathewson <nickm@torproject.org> | 2007-08-13 19:16:44 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2007-08-13 19:16:44 +0000 |
| commit | 89c65f2a4e833c5ff814f1a2be127e80785aa81c (patch) | |
| tree | 51d20e94709ca6551bca22038de230ee3d4f9b0d /src/or/router.c | |
| parent | ce1f01c3e6b55700baf46365aaef5a83fbae858e (diff) | |
| download | tor-89c65f2a4e833c5ff814f1a2be127e80785aa81c.tar.gz tor-89c65f2a4e833c5ff814f1a2be127e80785aa81c.zip | |
r14534@catbus: nickm | 2007-08-13 15:15:46 -0400
Read v3 keys from the right location
svn:r11087
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/router.c b/src/or/router.c index c54f11a20b..3fa3546b79 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -363,6 +363,10 @@ init_keys(void) 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. */ tor_snprintf(keydir,sizeof(keydir), "%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_id_key",datadir); @@ -371,10 +375,6 @@ init_keys(void) if (!prkey) return -1; 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. */ tor_snprintf(keydir,sizeof(keydir), "%s"PATH_SEPARATOR"keys"PATH_SEPARATOR"secret_onion_key",datadir); |