Merge branch 'tor-github/pr/415' into maint-0.3.5

This commit is contained in:
David Goulet 2018-10-30 11:36:36 -04:00
commit 95559279e1
2 changed files with 8 additions and 6 deletions

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.

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;