nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 13:06:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

hs-v3: Always generate the public key file on disk

Browse Source 
Fixes #23748

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
cathugger 2017-10-03 11:16:50 -04:00 committed by David Goulet
parent 1e7e36da4b
commit 9d90f9829c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug23748 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (hidden service):
- Always make sure the hidden service generate the public key file if it
is missing. Prior to this, if the public key was deleted from disk, it
wouldn't get recreated. Fixes bug 23748; bugfix on 0.3.2.2-alpha.

3
src/or/hs_service.c
View File

@ -981,7 +981,8 @@ load_service_keys(hs_service_t *service)
fname = hs_path_from_filename(config->directory_path, fname_keyfile_prefix);
/* Don't ask for key creation, we want to know if we were able to load it or
* we had to generate it. Better logging! */
kp = ed_key_init_from_file(fname, 0, LOG_INFO, NULL, 0, 0, 0, NULL);
kp = ed_key_init_from_file(fname, INIT_ED_KEY_SPLIT, LOG_INFO, NULL, 0, 0,
0, NULL);
if (!kp) {
log_info(LD_REND, "Unable to load keys from %s. Generating it...", fname);
/* We'll now try to generate the keys and for it we want the strongest