diff options
| author | cathugger <cathugger> | 2017-10-03 11:16:50 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2017-10-03 11:19:10 -0400 |
| commit | 9d90f9829ca8c2ce6eec4bcf3aaa72d95bedda24 (patch) | |
| tree | a3c3084e62163130a46cc9c9f2279be9ffbf328c | |
| parent | 1e7e36da4b6741235e77d97fff8446a6b7ba1300 (diff) | |
| download | tor-9d90f9829ca8c2ce6eec4bcf3aaa72d95bedda24.tar.gz tor-9d90f9829ca8c2ce6eec4bcf3aaa72d95bedda24.zip | |
hs-v3: Always generate the public key file on disk
Fixes #23748
Signed-off-by: David Goulet <dgoulet@torproject.org>
| -rw-r--r-- | changes/bug23748 | 4 | ||||
| -rw-r--r-- | src/or/hs_service.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug23748 b/changes/bug23748 new file mode 100644 index 0000000000..b7f42aff23 --- /dev/null +++ b/changes/bug23748 @@ -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. diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 5e575412b3..3d1945aa95 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -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 |