November 2016 - tor-commits - lists.torproject.org

[tor/maint-0.2.9] Use the latest options in rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 0ee9049e947ec44b3d228e4bb74bcbc28d32ca95 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:55:14 2016 +1100 Use the latest options in rend_service_check_private_dir Fixup on both: * Refactor, adding a create argument... and * Check every hidden service directory's permissions... --- src/or/rendservice.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index c62673a..56dbacd 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,7 +72,9 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); -static int rend_service_check_private_dir(const rend_service_t *s, int create); +static int rend_service_check_private_dir(const or_options_t *options, + const rend_service_t *s, + int create); /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. @@ -464,7 +466,7 @@ rend_config_services(const or_options_t *options, int validate_only) for (line = options->RendConfigLines; line; line = line->next) { if (!strcasecmp(line->key, "HiddenServiceDir")) { if (service) { /* register the one we just finished parsing */ - if (rend_service_check_private_dir(service, 0) < 0) { + if (rend_service_check_private_dir(options, service, 0) < 0) { rend_service_free(service); return -1; } @@ -679,7 +681,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - if (rend_service_check_private_dir(service, 0) < 0) { + if (rend_service_check_private_dir(options, service, 0) < 0) { rend_service_free(service); return -1; } @@ -1097,7 +1099,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) } /* Make sure the directory exists */ - if (rend_service_check_private_dir(service, 1) < 0) + if (rend_service_check_private_dir(get_options(), service, 1) < 0) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1255,7 +1257,8 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private. +/** Make sure that the directory for s is private, using the config in + * options. * If create is true: * - if the directory exists, change permissions if needed, * - if the directory does not exist, create it with the correct permissions. @@ -1264,7 +1267,9 @@ rend_service_derive_key_digests(struct rend_service_t *s) * - if the directory does not exist, check if we think we can create it. * Return 0 on success, -1 on failure. */ static int -rend_service_check_private_dir(const rend_service_t *s, int create) +rend_service_check_private_dir(const or_options_t *options, + const rend_service_t *s, + int create) { cpd_check_t check_opts = CPD_NONE; if (create) { @@ -1277,7 +1282,7 @@ rend_service_check_private_dir(const rend_service_t *s, int create) check_opts |= CPD_GROUP_READ; } /* Check/create directory */ - if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { + if (check_private_dir(s->directory, check_opts, options->User) < 0) { return -1; } return 0; @@ -1292,7 +1297,7 @@ rend_service_load_keys(rend_service_t *s) char *fname = NULL; char buf[128]; - if (rend_service_check_private_dir(s, 1) < 0) + if (rend_service_check_private_dir(get_options(), s, 1) < 0) goto err; /* Load key */

1 0

[tor/maint-0.2.9] Use check_private_dir in test_single_onion_poisoning
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit fedafe7c0eb9eda0d11dd1b5ba37b7faff625c88 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:37:05 2016 +1100 Use check_private_dir in test_single_onion_poisoning This avoids Win32 conditionals for mkdir. --- src/test/test_hs.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index fd5ab15..39a2c91 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -550,20 +550,11 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); /* Create directories for both services */ - -#ifdef _WIN32 - ret = mkdir(mock_options->DataDirectory); - tt_assert(ret == 0); - ret = mkdir(dir1); - tt_assert(ret == 0); - ret = mkdir(dir2); -#else - ret = mkdir(mock_options->DataDirectory, 0700); + ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir1, 0700); + ret = check_private_dir(dir1, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir2, 0700); -#endif + ret = check_private_dir(dir2, CPD_CREATE, NULL); tt_assert(ret == 0); service_1->directory = dir1; @@ -694,7 +685,7 @@ test_single_onion_poisoning(void *arg) tt_assert(ret < 0); done: - /* TODO: should we delete the directories here? */ + /* The test harness deletes the directories at exit */ rend_service_free(service_1); rend_service_free(service_2); smartlist_free(services);

1 0

[tor/maint-0.2.9] fixup! Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit a906ff88a3660ff689a2bd630836b74d70a1ce6c Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:10:52 2016 +1100 fixup! Refactor, adding a create argument to rend_service_check_private_dir --- src/or/rendservice.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index dca775e..6743d82 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1246,17 +1246,23 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private. If create is - * true, if it exists, change permissions if needed, otherwise, create it with - * the correct permissions. Otherwise, if create is false and the - * directory does not exist, check if we think we can create it. +/** Make sure that the directory for s is private. + * If create is true: + * - if the directory exists, change permissions if needed, + * - if the directory does not exist, create it with the correct permissions. + * If create is false: + * - if the directory exists, check permissions, + * - if the directory does not exist, check if we think we can create it. * Return 0 on success, -1 on failure. */ static int rend_service_check_private_dir(const rend_service_t *s, int create) { - cpd_check_t check_opts = CPD_CREATE; - if (!create) { + cpd_check_t check_opts = CPD_NONE; + if (create) { + check_opts |= CPD_CREATE; + } else { check_opts |= CPD_CHECK_MODE_ONLY; + check_opts |= CPD_CHECK; } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ;

1 0

[tor/maint-0.2.9] Create get_fname_suffix, and refactor get_fname to use it
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit d7634dc5196801c5a3e6be9eb2167c2c96f48ab4 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 14:13:34 2016 +1100 Create get_fname_suffix, and refactor get_fname to use it --- src/test/testing_common.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/test/testing_common.c b/src/test/testing_common.c index fd7c4e7..e28e3dd 100644 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@ -102,18 +102,29 @@ setup_directory(void) temp_dir_setup_in_pid = getpid(); } -/** Return a filename relative to our testing temporary directory */ -const char * -get_fname(const char *name) +/** Return a filename relative to our testing temporary directory, based on + * name and suffix. If name is NULL, return the name of the testing temporary + * directory. */ +static const char * +get_fname_suffix(const char *name, const char *suffix) { static char buf[1024]; setup_directory(); if (!name) return temp_dir; - tor_snprintf(buf,sizeof(buf),"%s/%s",temp_dir,name); + tor_snprintf(buf,sizeof(buf),"%s/%s%s%s",temp_dir,name,suffix ? "_" : "", + suffix ? suffix : ""); return buf; } +/** Return a filename relative to our testing temporary directory. If name is + * NULL, return the name of the testing temporary directory. */ +const char * +get_fname(const char *name) +{ + return get_fname_suffix(name, NULL); +} + /* Remove a directory and all of its subdirectories */ static void rm_rf(const char *dir)

1 0

[tor/maint-0.2.9] Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit c9db775243dc83c3300e7a88e0ad6afc74671825 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:16:00 2016 +1100 Refactor, adding a create argument to rend_service_check_private_dir It used to be rend_service_check_and_create_private_dir, which always created the directory. No behaviour change. --- src/or/rendservice.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1bf6ae9..610ed75 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,7 +72,7 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); -static int rend_service_check_and_create_private_dir(const rend_service_t *s); +static int rend_service_check_private_dir(const rend_service_t *s, int create); /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. @@ -674,12 +674,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - cpd_check_t check_opts = CPD_CHECK_MODE_ONLY|CPD_CHECK; - if (service->dir_group_readable) { - check_opts |= CPD_GROUP_READ; - } - - if (check_private_dir(service->directory, check_opts, options->User) < 0) { + if (rend_service_check_private_dir(service, 0) < 0) { rend_service_free(service); return -1; } @@ -1093,7 +1088,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) } /* Make sure the directory exists */ - if (rend_service_check_and_create_private_dir(service) < 0) + if (rend_service_check_private_dir(service, 1) < 0) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1251,12 +1246,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private, creating it - * if needed. Return 0 on success, -1 on failure. */ +/** Make sure that the directory for s is private. If create is + * true, if it exists, change permissions if needed, otherwise, create it with + * the correct permissions. Otherwise, if create is false and the + * directory does not exist, check if we think we can create it. + * Return 0 on success, -1 on failure. */ static int -rend_service_check_and_create_private_dir(const rend_service_t *s) +rend_service_check_private_dir(const rend_service_t *s, int create) { cpd_check_t check_opts = CPD_CREATE; + if (!create) { + check_opts |= CPD_CHECK_MODE_ONLY; + } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } @@ -1265,7 +1266,7 @@ rend_service_check_and_create_private_dir(const rend_service_t *s) return -1; } #ifndef _WIN32 - if (s->dir_group_readable) { + if (s->dir_group_readable && create) { /* Only new dirs created get new opts, also enforce group read. */ if (chmod(s->directory, 0750)) { log_warn(LD_FS,"Unable to make %s group-readable.", s->directory); @@ -1285,7 +1286,7 @@ rend_service_load_keys(rend_service_t *s) char *fname = NULL; char buf[128]; - if (rend_service_check_and_create_private_dir(s) < 0) + if (rend_service_check_private_dir(s, 1) < 0) goto err; /* Load key */

1 0

[tor/release-0.2.9] Refactor, adding a create argument to rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit c9db775243dc83c3300e7a88e0ad6afc74671825 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:16:00 2016 +1100 Refactor, adding a create argument to rend_service_check_private_dir It used to be rend_service_check_and_create_private_dir, which always created the directory. No behaviour change. --- src/or/rendservice.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 1bf6ae9..610ed75 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,7 +72,7 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); -static int rend_service_check_and_create_private_dir(const rend_service_t *s); +static int rend_service_check_private_dir(const rend_service_t *s, int create); /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. @@ -674,12 +674,7 @@ rend_config_services(const or_options_t *options, int validate_only) } } if (service) { - cpd_check_t check_opts = CPD_CHECK_MODE_ONLY|CPD_CHECK; - if (service->dir_group_readable) { - check_opts |= CPD_GROUP_READ; - } - - if (check_private_dir(service->directory, check_opts, options->User) < 0) { + if (rend_service_check_private_dir(service, 0) < 0) { rend_service_free(service); return -1; } @@ -1093,7 +1088,7 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) } /* Make sure the directory exists */ - if (rend_service_check_and_create_private_dir(service) < 0) + if (rend_service_check_private_dir(service, 1) < 0) return -1; poison_fname = rend_service_sos_poison_path(service); @@ -1251,12 +1246,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Make sure that the directory for s is private, creating it - * if needed. Return 0 on success, -1 on failure. */ +/** Make sure that the directory for s is private. If create is + * true, if it exists, change permissions if needed, otherwise, create it with + * the correct permissions. Otherwise, if create is false and the + * directory does not exist, check if we think we can create it. + * Return 0 on success, -1 on failure. */ static int -rend_service_check_and_create_private_dir(const rend_service_t *s) +rend_service_check_private_dir(const rend_service_t *s, int create) { cpd_check_t check_opts = CPD_CREATE; + if (!create) { + check_opts |= CPD_CHECK_MODE_ONLY; + } if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } @@ -1265,7 +1266,7 @@ rend_service_check_and_create_private_dir(const rend_service_t *s) return -1; } #ifndef _WIN32 - if (s->dir_group_readable) { + if (s->dir_group_readable && create) { /* Only new dirs created get new opts, also enforce group read. */ if (chmod(s->directory, 0750)) { log_warn(LD_FS,"Unable to make %s group-readable.", s->directory); @@ -1285,7 +1286,7 @@ rend_service_load_keys(rend_service_t *s) char *fname = NULL; char buf[128]; - if (rend_service_check_and_create_private_dir(s) < 0) + if (rend_service_check_private_dir(s, 1) < 0) goto err; /* Load key */

1 0

[tor/release-0.2.9] Use check_private_dir in test_single_onion_poisoning
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit fedafe7c0eb9eda0d11dd1b5ba37b7faff625c88 Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:37:05 2016 +1100 Use check_private_dir in test_single_onion_poisoning This avoids Win32 conditionals for mkdir. --- src/test/test_hs.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/src/test/test_hs.c b/src/test/test_hs.c index fd5ab15..39a2c91 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -550,20 +550,11 @@ test_single_onion_poisoning(void *arg) tt_assert(ret == 0); /* Create directories for both services */ - -#ifdef _WIN32 - ret = mkdir(mock_options->DataDirectory); - tt_assert(ret == 0); - ret = mkdir(dir1); - tt_assert(ret == 0); - ret = mkdir(dir2); -#else - ret = mkdir(mock_options->DataDirectory, 0700); + ret = check_private_dir(mock_options->DataDirectory, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir1, 0700); + ret = check_private_dir(dir1, CPD_CREATE, NULL); tt_assert(ret == 0); - ret = mkdir(dir2, 0700); -#endif + ret = check_private_dir(dir2, CPD_CREATE, NULL); tt_assert(ret == 0); service_1->directory = dir1; @@ -694,7 +685,7 @@ test_single_onion_poisoning(void *arg) tt_assert(ret < 0); done: - /* TODO: should we delete the directories here? */ + /* The test harness deletes the directories at exit */ rend_service_free(service_1); rend_service_free(service_2); smartlist_free(services);

1 0

[tor/release-0.2.9] Remove redundant group permission code from rend_service_check_private_dir
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 6c541815592b76ecb7dc639123bce894bf47b67f Author: teor <teor2345(a)gmail.com> Date: Wed Nov 2 11:20:49 2016 +1100 Remove redundant group permission code from rend_service_check_private_dir check_private_dir already does this for existing directories. --- src/or/rendservice.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 610ed75..dca775e 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1265,15 +1265,6 @@ rend_service_check_private_dir(const rend_service_t *s, int create) if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { return -1; } -#ifndef _WIN32 - if (s->dir_group_readable && create) { - /* Only new dirs created get new opts, also enforce group read. */ - if (chmod(s->directory, 0750)) { - log_warn(LD_FS,"Unable to make %s group-readable.", s->directory); - } - } -#endif - return 0; }

1 0

[tor/maint-0.2.9] Create single-onion-service directory before poisoning it, if needed
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 8841a9e396372771a170656ebfab4b4bf6b0c593 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 31 14:53:30 2016 -0400 Create single-onion-service directory before poisoning it, if needed (Also, refactor the code to create a hidden service directory into a separate funcion, so we don't have to duplicate it.) Fixes bug 20484; bugfix on 0.2.9.3-alpha. --- changes/bug20484 | 5 +++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/changes/bug20484 b/changes/bug20484 new file mode 100644 index 0000000..9a0b95c --- /dev/null +++ b/changes/bug20484 @@ -0,0 +1,5 @@ + o Minor bugfixes (single onion services): + - Start correctly when creating a single onion service in a + directory that did not previously exist. Fixes bug 20484; bugfix on + 0.2.9.3-alpha. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3afe880..1bf6ae9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,6 +72,8 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); +static int rend_service_check_and_create_private_dir(const rend_service_t *s); + /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. */ @@ -1090,6 +1092,10 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) return -1; } + /* Make sure the directory exists */ + if (rend_service_check_and_create_private_dir(service) < 0) + return -1; + poison_fname = rend_service_sos_poison_path(service); switch (file_status(poison_fname)) { @@ -1245,22 +1251,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Load and/or generate private keys for the hidden service s, - * possibly including keys for client authorization. Return 0 on success, -1 - * on failure. */ +/** Make sure that the directory for s is private, creating it + * if needed. Return 0 on success, -1 on failure. */ static int -rend_service_load_keys(rend_service_t *s) +rend_service_check_and_create_private_dir(const rend_service_t *s) { - char *fname = NULL; - char buf[128]; cpd_check_t check_opts = CPD_CREATE; - if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } /* Check/create directory */ if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { - goto err; + return -1; } #ifndef _WIN32 if (s->dir_group_readable) { @@ -1271,6 +1273,21 @@ rend_service_load_keys(rend_service_t *s) } #endif + return 0; +} + +/** Load and/or generate private keys for the hidden service s, + * possibly including keys for client authorization. Return 0 on success, -1 + * on failure. */ +static int +rend_service_load_keys(rend_service_t *s) +{ + char *fname = NULL; + char buf[128]; + + if (rend_service_check_and_create_private_dir(s) < 0) + goto err; + /* Load key */ fname = rend_service_path(s, private_key_fname); s->private_key = init_key_from_file(fname, 1, LOG_ERR, 0);

1 0

[tor/release-0.2.9] Create single-onion-service directory before poisoning it, if needed
by nickm＠torproject.org 07 Nov '16

07 Nov '16

commit 8841a9e396372771a170656ebfab4b4bf6b0c593 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 31 14:53:30 2016 -0400 Create single-onion-service directory before poisoning it, if needed (Also, refactor the code to create a hidden service directory into a separate funcion, so we don't have to duplicate it.) Fixes bug 20484; bugfix on 0.2.9.3-alpha. --- changes/bug20484 | 5 +++++ src/or/rendservice.c | 33 +++++++++++++++++++++++++-------- 2 files changed, 30 insertions(+), 8 deletions(-) diff --git a/changes/bug20484 b/changes/bug20484 new file mode 100644 index 0000000..9a0b95c --- /dev/null +++ b/changes/bug20484 @@ -0,0 +1,5 @@ + o Minor bugfixes (single onion services): + - Start correctly when creating a single onion service in a + directory that did not previously exist. Fixes bug 20484; bugfix on + 0.2.9.3-alpha. + diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 3afe880..1bf6ae9 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -72,6 +72,8 @@ static ssize_t rend_service_parse_intro_for_v3( size_t plaintext_len, char **err_msg_out); +static int rend_service_check_and_create_private_dir(const rend_service_t *s); + /** Represents the mapping from a virtual port of a rendezvous service to * a real port on some IP. */ @@ -1090,6 +1092,10 @@ poison_new_single_onion_hidden_service_dir(const rend_service_t *service) return -1; } + /* Make sure the directory exists */ + if (rend_service_check_and_create_private_dir(service) < 0) + return -1; + poison_fname = rend_service_sos_poison_path(service); switch (file_status(poison_fname)) { @@ -1245,22 +1251,18 @@ rend_service_derive_key_digests(struct rend_service_t *s) return 0; } -/** Load and/or generate private keys for the hidden service s, - * possibly including keys for client authorization. Return 0 on success, -1 - * on failure. */ +/** Make sure that the directory for s is private, creating it + * if needed. Return 0 on success, -1 on failure. */ static int -rend_service_load_keys(rend_service_t *s) +rend_service_check_and_create_private_dir(const rend_service_t *s) { - char *fname = NULL; - char buf[128]; cpd_check_t check_opts = CPD_CREATE; - if (s->dir_group_readable) { check_opts |= CPD_GROUP_READ; } /* Check/create directory */ if (check_private_dir(s->directory, check_opts, get_options()->User) < 0) { - goto err; + return -1; } #ifndef _WIN32 if (s->dir_group_readable) { @@ -1271,6 +1273,21 @@ rend_service_load_keys(rend_service_t *s) } #endif + return 0; +} + +/** Load and/or generate private keys for the hidden service s, + * possibly including keys for client authorization. Return 0 on success, -1 + * on failure. */ +static int +rend_service_load_keys(rend_service_t *s) +{ + char *fname = NULL; + char buf[128]; + + if (rend_service_check_and_create_private_dir(s) < 0) + goto err; + /* Load key */ fname = rend_service_path(s, private_key_fname); s->private_key = init_key_from_file(fname, 1, LOG_ERR, 0);

1 0