mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 15:10:48 +01:00
Code Issues Projects Releases Wiki Activity

Improve log messages related to identity key

Browse source 
Improve the messages logged when Tor wants or needs to load the master ed25519 identity key so the user is explicitly informed when further action is required or not. Fixes ticket #20650.
This commit is contained in:
s7r 2016-11-27 13:07:43 +00:00 • committed by GitHub
parent 4614f8e681
commit 215cc0d527
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/or/routerkeys.c
View file

@ -742,8 +742,12 @@ load_ed_keys(const or_options_t *options, time_t now)
if (need_new_signing_key) { if (need_new_signing_key) {
log_notice(LD_OR, "It looks like I need to generate and sign a new " 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 " "medium-term signing key, because %s. To do that, I "
"load%s the permanent master identity key.", "need to load the permanent master identity key. "
"If the master identity key was not moved or encrypted "
"with a passphrase, this will be done automatically and "
"no further action is required. Otherwise, provide the "
"necessary data using 'tor --keygen' to do it manually.",
(NULL == use_signing) ? "I don't have one" : (NULL == use_signing) ? "I don't have one" :
EXPIRES_SOON(check_signing_cert, 0) ? "the one I have is expired" : EXPIRES_SOON(check_signing_cert, 0) ? "the one I have is expired" :
"you asked me to make one with --keygen", "you asked me to make one with --keygen",
@ -751,15 +755,19 @@ load_ed_keys(const or_options_t *options, time_t now)
} else if (want_new_signing_key && !offline_master) { } else if (want_new_signing_key && !offline_master) {
log_notice(LD_OR, "It looks like I should try to generate and sign a " 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 " "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 " "going to expire soon. To do that, I'm going to have to "
"load the permanent master identity key."); "try to load the permanent master identity key. "
"If the master identity key was not moved or encrypted "
"with a passphrase, this will be done automatically and "
"no further action is required. Otherwise, provide the "
"necessary data using 'tor --keygen' to do it manually.");
} else if (want_new_signing_key) { } else if (want_new_signing_key) {
log_notice(LD_OR, "It looks like I should try to generate and sign a " 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 " "new medium-term signing key, because the one I have is "
"going to expire soon. But OfflineMasterKey is set, so I " "going to expire soon. But OfflineMasterKey is set, so I "
"won't try to load a permanent master identity key is set. " "won't try to load a permanent master identity key. You "
"You will need to use 'tor --keygen' make a new signing key " "will need to use 'tor --keygen' to make a new signing "
"and certificate."); "key and certificate.");
} }
{ {