[or-cvs] r14595: Backport: Actually load the legacy key, not just the authori (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-05-12 11:42:18 -0400 (Mon, 12 May 2008)
New Revision: 14595

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/src/or/router.c
Log:
 r19707 at catbus:  nickm | 2008-05-12 11:42:05 -0400
 Backport: Actually load the legacy key, not just the authority key twice.



Property changes on: tor/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r19707] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/src/or/router.c
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/router.c	2008-05-12 15:40:36 UTC (rev 14594)
+++ tor/branches/tor-0_2_0-patches/src/or/router.c	2008-05-12 15:42:18 UTC (rev 14595)
@@ -344,7 +344,7 @@
     return -1;
 
   if (get_options()->V3AuthUseLegacyKey &&
-      load_authority_keyset(0, &legacy_signing_key,
+      load_authority_keyset(1, &legacy_signing_key,
                             &legacy_key_certificate)<0)
     return -1;