From 57189acd6f6b56a419d63a7acb012a9b8abac319 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Sun, 1 Mar 2015 14:36:40 +0100 Subject: # This is a combination of 2 commits. # The first commit's message is: 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. # The 2nd commit message will be skipped: # fixup! Regenerate ed25519 keys when they will expire soon. --- src/test/test_routerkeys.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/test') diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 2434255b63..49174243ca 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -419,6 +419,13 @@ test_routerkeys_ed_keys_init_all(void *arg) ed25519_keypair_t sign, link, auth; // tor_cert_t *cert_is, *cert_sl, *cert_auth; + options->SigningKeyLifetime = 30*86400; + options->TestingAuthKeyLifetime = 2*86400; + options->TestingLinkKeyLifetime = 2*86400; + options->TestingSigningKeySlop = 2*86400; + options->TestingAuthKeySlop = 2*3600; + options->TestingLinkKeySlop = 2*3600; + #ifdef _WIN32 mkdir(dir); mkdir(get_fname("test_ed_keys_init_all/keys")); -- cgit v1.2.3-54-g00ecf