[tor-commits] [tor/master] Regenerate ed25519 keys when they will expire soon.

[nickm at torproject.org]

commit 32f59d73372f5843ceb305a9d58387573d90f4f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 28 10:44:09 2015 -0400

    Regenerate ed25519 keys when they will expire soon.
    
    Also, have testing-level options to set the lifetimes and
    expiration-tolerances of all key types, plus a non-testing-level
    option to set the lifetime of any auto-generated signing key.
---
 src/or/config.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index 34e7e76..07451b3 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3643,9 +3643,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
   if (options->SigningKeyLifetime < options->TestingSigningKeySlop*2)
     REJECT("SigningKeyLifetime is too short.");
   if (options->TestingLinkKeyLifetime < options->TestingAuthKeySlop*2)
-    REJECT("LinkKeyLifetime is too short.");
+    REJECT("TestingLinkKeyLifetime is too short.");
   if (options->TestingAuthKeyLifetime < options->TestingLinkKeySlop*2)
-    REJECT("AuthKeyLifetime is too short.");
+    REJECT("TestingAuthKeyLifetime is too short.");
 
   if (options->TestingV3AuthInitialVotingInterval
       < MIN_VOTE_INTERVAL_TESTING_INITIAL) {