diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-25 14:19:48 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-25 15:14:57 -0400 |
| commit | 934859cf80902e6a16fb69d884fadc8ea831779f (patch) | |
| tree | 0567013871dbad5cfb70f87292e4a1772361a535 /src/feature/rend/rendservice.c | |
| parent | c82163dff468443d28b6d0c9b1253f7721eb3fdc (diff) | |
| download | tor-934859cf80902e6a16fb69d884fadc8ea831779f.tar.gz tor-934859cf80902e6a16fb69d884fadc8ea831779f.zip | |
Move key-loading and crosscert-checking out of feature/relay
This is also used by onion services, so it needs to go in another
module.
Diffstat (limited to 'src/feature/rend/rendservice.c')
| -rw-r--r-- | src/feature/rend/rendservice.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 7966ab8463..b165740030 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -31,6 +31,7 @@ #include "feature/rend/rendcommon.h" #include "feature/rend/rendservice.h" #include "feature/relay/router.h" +#include "feature/keymgt/loadkey.h" #include "core/or/relay.h" #include "feature/stats/rephist.h" #include "feature/hs_common/replaycache.h" @@ -1363,7 +1364,7 @@ rend_service_key_on_disk(const char *directory_path) /* Load key */ fname = hs_path_from_filename(directory_path, private_key_fname); - pk = init_key_from_file(fname, 0, LOG_DEBUG, 0); + pk = init_key_from_file(fname, 0, LOG_DEBUG, NULL); if (pk) { ret = 1; } @@ -1535,7 +1536,7 @@ rend_service_load_keys(rend_service_t *s) /* Load key */ fname = rend_service_path(s, private_key_fname); - s->private_key = init_key_from_file(fname, 1, LOG_ERR, 0); + s->private_key = init_key_from_file(fname, 1, LOG_ERR, NULL); if (!s->private_key) goto err; |