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

 Read v3 keys from the right location

svn:r11087

diff --git a/ChangeLog b/ChangeLog
index 83cca79e42c0d667246a93f9f971d3a6321f8716..e3dcc438792da9976ff216b5f7e065d683c4bac9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,9 +15,12 @@ Changes in version 0.2.0.5-alpha - 2007-??-??
     - Store v3 consensus status consensuses on disk, and reload them
       on startup.
 
-  o Minor featuers (security):
+  o Minor features (security):
     - 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
   o Major security fixes:

diff --git a/src/or/router.c b/src/or/router.c
index c54f11a20b95be02e25f391256758d36f0512960..3fa3546b79ccbde30e70d86a6f087814fff4e40e 100644 (file)
--- 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);