nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

hs-v3: Always generate the descriptor cookie

Browse Source 
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>
This commit is contained in:
David Goulet 2018-10-18 11:44:26 -04:00
parent a5599fb71c
commit 56f713b8a4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket27995 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (hidden service v3, client authorization):
- Fix an assert() when adding a client authorization for the first time
and then sending a HUP signal to the service. Before that, tor would
stop abruptly. Fixes bug 27995; bugfix on 0.3.5.1-alpha.

10
src/feature/hs/hs_service.c
View File

@ -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;