[or-cvs] r11087: Read v3 keys from the right location (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2007-08-13 15:16:44 -0400 (Mon, 13 Aug 2007)
New Revision: 11087

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/router.c
Log:
 r14534 at catbus:  nickm | 2007-08-13 15:15:46 -0400
 Read v3 keys from the right location



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r14534] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2007-08-13 18:47:22 UTC (rev 11086)
+++ tor/trunk/ChangeLog	2007-08-13 19:16:44 UTC (rev 11087)
@@ -15,10 +15,13 @@
     - 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:
     - Close immediately after missing authentication on control port;

Modified: tor/trunk/src/or/router.c
===================================================================
--- tor/trunk/src/or/router.c	2007-08-13 18:47:22 UTC (rev 11086)
+++ tor/trunk/src/or/router.c	2007-08-13 19:16:44 UTC (rev 11087)
@@ -363,6 +363,10 @@
     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 @@
   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);