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.

diff --git a/src/or/config.c b/src/or/config.c
index 34e7e767a035c3c31bac0368f6e3ce6d033f0178..07451b321e7ad215cfd0347be387e70303bd2606 100644 (file)
--- 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) {