mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'public/feature_16580'

Browse source
This commit is contained in:
Nick Mathewson 2015-07-16 15:48:41 -04:00
commit 3d19eb71d2
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/or/main.c
View file

@ -2034,7 +2034,7 @@ do_main_loop(void)
/* Initialize the keypinning log. */ /* Initialize the keypinning log. */
if (authdir_mode_v3(get_options())) { if (authdir_mode_v3(get_options())) {
char *fname = get_datadir_fname("key-pinning-entries"); char *fname = get_datadir_fname("key-pinning-journal");
int r = 0; int r = 0;
if (keypin_load_journal(fname)<0) { if (keypin_load_journal(fname)<0) {
log_err(LD_DIR, "Error loading key-pinning journal: %s",strerror(errno)); log_err(LD_DIR, "Error loading key-pinning journal: %s",strerror(errno));
@ -2048,6 +2048,17 @@ do_main_loop(void)
if (r) if (r)
return r; return r;
} }
{
/* This is the old name for key-pinning-journal. These got corrupted
* in a couple of cases by #16530, so we started over. See #16580 for
* the rationale and for other options we didn't take. We can remove
* this code once all the authorities that ran 0.2.7.1-alpha-dev are
* upgraded.
*/
char *fname = get_datadir_fname("key-pinning-entries");
unlink(fname);
tor_free(fname);
}
if (trusted_dirs_reload_certs()) { if (trusted_dirs_reload_certs()) {
log_warn(LD_DIR, log_warn(LD_DIR,