nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'sebastian/bug20065'

Browse Source
This commit is contained in:
Nick Mathewson 2016-09-06 10:12:42 -04:00
commit 440228907d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug20065 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (directory authorities):
- Die with a useful error when the operator forgets to place the
authority_signing_key file into the keys directory. This avoids an
uninformative assert & traceback about having an invalid key.
Fixes bug 20065; bugfix on 0.2.0.1-alpha.

5
src/or/router.c
View File

@ -452,7 +452,8 @@ init_key_from_file(const char *fname, int generate, int severity,
goto error;
}
} else {
log_info(LD_GENERAL, "No key found in \"%s\"", fname);
tor_log(severity, LD_GENERAL, "No key found in \"%s\"", fname);
goto error;
}
return prkey;
case FN_FILE:
@ -560,7 +561,7 @@ load_authority_keyset(int legacy, crypto_pk_t **key_out,
fname = get_datadir_fname2("keys",
legacy ? "legacy_signing_key" : "authority_signing_key");
signing_key = init_key_from_file(fname, 0, LOG_INFO, 0);
signing_key = init_key_from_file(fname, 0, LOG_ERR, 0);
if (!signing_key) {
log_warn(LD_DIR, "No version 3 directory key found in %s", fname);
goto done;