From 89c65f2a4e833c5ff814f1a2be127e80785aa81c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 13 Aug 2007 19:16:44 +0000
Subject: [PATCH] r14534@catbus: nickm | 2007-08-13 15:15:46 -0400 Read v3
keys from the right location
svn:r11087
---
ChangeLog | 5 ++++-
src/or/router.c | 8 ++++----
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 83cca79e42..e3dcc43879 100644
--- 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 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);
--
GitLab