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

Merge remote-tracking branch 'public/bug8207'

Browse Source
This commit is contained in:
Nick Mathewson 2013-02-15 16:29:43 -05:00
commit 73182e3220
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changes/bug8207 Normal file
View File

@ -0,0 +1,7 @@
o Major bugfixes (hidden services):
- Allow hidden service authentication to succeed again. When we
refactored the hidden service introduction code back in 0.2.4.1-alpha,
we didn't update the code that checks whether authentication
information is present, causing all authentication checks to
return "false". Fix for bug 8207; bugfix on 0.2.4.1-alpha. Found by
Coverity; this is CID 718615.

12
src/or/rendservice.c
View File

@ -1119,11 +1119,7 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
crypt_path_t *cpath = NULL; crypt_path_t *cpath = NULL;
char hexcookie[9]; char hexcookie[9];
int circ_needs_uptime; int circ_needs_uptime;
char intro_key_digest[DIGEST_LEN];
size_t auth_len = 0;
char auth_data[REND_DESC_COOKIE_LEN];
time_t now = time(NULL); time_t now = time(NULL);
char diffie_hellman_hash[DIGEST_LEN];
time_t elapsed; time_t elapsed;
int replay; int replay;
@ -1296,8 +1292,9 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
/* If the service performs client authorization, check included auth data. */ /* If the service performs client authorization, check included auth data. */
if (service->clients) { if (service->clients) {
if (auth_len > 0) { if (parsed_req->version == 3 && parsed_req->u.v3.auth_len > 0) {
if (rend_check_authorization(service, auth_data)) { if (rend_check_authorization(service,
(const char*)parsed_req->u.v3.auth_data)) {
log_info(LD_REND, "Authorization data in INTRODUCE2 cell are valid."); log_info(LD_REND, "Authorization data in INTRODUCE2 cell are valid.");
} else { } else {
log_info(LD_REND, "The authorization data that are contained in " log_info(LD_REND, "The authorization data that are contained in "
@ -1410,9 +1407,6 @@ rend_service_introduce(origin_circuit_t *circuit, const uint8_t *request,
memwipe(buf, 0, sizeof(buf)); memwipe(buf, 0, sizeof(buf));
memwipe(serviceid, 0, sizeof(serviceid)); memwipe(serviceid, 0, sizeof(serviceid));
memwipe(hexcookie, 0, sizeof(hexcookie)); memwipe(hexcookie, 0, sizeof(hexcookie));
memwipe(intro_key_digest, 0, sizeof(intro_key_digest));
memwipe(auth_data, 0, sizeof(auth_data));
memwipe(diffie_hellman_hash, 0, sizeof(diffie_hellman_hash));
/* Free the parsed cell */ /* Free the parsed cell */
if (parsed_req) { if (parsed_req) {