aboutsummaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2018-10-18 11:44:26 -0400
committerDavid Goulet <dgoulet@torproject.org>2018-10-18 11:46:07 -0400
commit56f713b8a477b4203f3bfd8f3ad0952706dc9599 (patch)
treef1872f30fa05c33f44037539e010418621e4625b /src/feature
parenta5599fb71c51ddec47282164f71cfb06933096cc (diff)
downloadtor-56f713b8a477b4203f3bfd8f3ad0952706dc9599.tar.gz
tor-56f713b8a477b4203f3bfd8f3ad0952706dc9599.zip
hs-v3: Always generate the descriptor cookie
It won't be used if there are no authorized client configured. We do that so we can easily support the addition of a client with a HUP signal which allow us to avoid more complex code path to generate that cookie if we have at least one client auth and we had none before. Fixes #27995 Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/hs/hs_service.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c
index 78654bfb23..aec2aa4381 100644
--- a/src/feature/hs/hs_service.c
+++ b/src/feature/hs/hs_service.c
@@ -1924,12 +1924,10 @@ build_service_desc_keys(const hs_service_t *service,
goto end;
}
- /* Random a descriptor cookie to be used as a part of a key to encrypt the
- * descriptor, if the client auth is enabled. */
- if (service->config.is_client_auth_enabled) {
- crypto_strongest_rand(desc->descriptor_cookie,
- sizeof(desc->descriptor_cookie));
- }
+ /* Random descriptor cookie to be used as a part of a key to encrypt the
+ * descriptor, only if the client auth is enabled will it be used. */
+ crypto_strongest_rand(desc->descriptor_cookie,
+ sizeof(desc->descriptor_cookie));
/* Success. */
ret = 0;