summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-05-28 10:44:09 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-28 10:44:09 -0400
commit32f59d73372f5843ceb305a9d58387573d90f4f6 (patch)
tree5feb47b2a6a07a920976c6db09110b3b0a6573e5
parent57189acd6f6b56a419d63a7acb012a9b8abac319 (diff)
downloadtor-32f59d73372f5843ceb305a9d58387573d90f4f6.tar.gz
tor-32f59d73372f5843ceb305a9d58387573d90f4f6.zip
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.
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 34e7e767a0..07451b321e 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) {