diff options
| author | David Goulet <dgoulet@torproject.org> | 2018-08-22 11:32:57 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2018-08-22 11:32:57 -0400 |
| commit | cb466ee7d6f7f475783847a7201eaa6a3e1c711b (patch) | |
| tree | 89febd1b50ae5a426670ca1702e0e2698a3119d6 /src/feature/hs | |
| parent | e619fd02ef9a9926731244b2b19024a04f93fd5a (diff) | |
| download | tor-cb466ee7d6f7f475783847a7201eaa6a3e1c711b.tar.gz tor-cb466ee7d6f7f475783847a7201eaa6a3e1c711b.zip | |
key: Make ed_key_init_from_file() take an or_options_t
Part of #27215, we need to call the ed_key_init_from_file function during
option_validate() which is before the global_options variable is set.
This commit make ed_key_init_from_file() stop using get_options() and instead
now has a or_options_t parameter.
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/hs')
| -rw-r--r-- | src/feature/hs/hs_service.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index 8a9429271b..a9364a7514 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -1037,7 +1037,7 @@ load_service_keys(hs_service_t *service) /* 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, INIT_ED_KEY_SPLIT, LOG_INFO, NULL, 0, 0, - 0, NULL); + 0, NULL, 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 @@ -1045,7 +1045,7 @@ load_service_keys(hs_service_t *service) uint32_t key_flags = INIT_ED_KEY_CREATE | INIT_ED_KEY_EXTRA_STRONG | INIT_ED_KEY_SPLIT; kp = ed_key_init_from_file(fname, key_flags, LOG_WARN, NULL, 0, 0, 0, - NULL); + NULL, NULL); if (!kp) { log_warn(LD_REND, "Unable to generate keys and save in %s.", fname); goto end; |