aboutsummaryrefslogtreecommitdiff
path: root/src/or/routerkeys.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-08-10 10:35:47 -0400
committerNick Mathewson <nickm@torproject.org>2015-08-19 13:36:51 -0400
commitc88a8a7ca38e3dd43dca913fbe22aee819420c4a (patch)
tree3f154f4a783e7f3b8377b1ead7977872eeab19a9 /src/or/routerkeys.c
parenta1b5e8b30b277c8856b3109038afcc5dd7e4c82c (diff)
downloadtor-c88a8a7ca38e3dd43dca913fbe22aee819420c4a.tar.gz
tor-c88a8a7ca38e3dd43dca913fbe22aee819420c4a.zip
Explain better why we are about to load the master key.
Diffstat (limited to 'src/or/routerkeys.c')
-rw-r--r--src/or/routerkeys.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/or/routerkeys.c b/src/or/routerkeys.c
index 2b967dd893..025fa6f514 100644
--- a/src/or/routerkeys.c
+++ b/src/or/routerkeys.c
@@ -660,6 +660,20 @@ load_ed_keys(const or_options_t *options, time_t now)
need_new_signing_key ||
EXPIRES_SOON(check_signing_cert, options->TestingSigningKeySlop);
+ if (need_new_signing_key) {
+ log_notice(LD_OR, "It looks like I need to generate and sign a new "
+ "medium-term signing key, because %s. To do that, I need to "
+ "load (or create) the permanent master identity key.",
+ (NULL == use_signing) ? "I don't have one" :
+ EXPIRES_SOON(check_signing_cert, 0) ? "the one I have is expired" :
+ "you asked me to make one with --keygen");
+ } else if (want_new_signing_key) {
+ log_notice(LD_OR, "It looks like I should try to generate and sign a "
+ "new medium-term signing key, because the one I have is "
+ "going to expire soon. To do that, I'm going to have to try to "
+ "load the permanent master identity key.");
+ }
+
{
uint32_t flags =
(INIT_ED_KEY_SPLIT|