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 branch 'maint-0.4.4'

Browse Source
This commit is contained in:
David Goulet 2020-06-22 14:57:50 -04:00
commit 033f804429
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket40005 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfix (control port, onion service):
- Consistently use 'address' in "Invalid v3 address" response to
ONION_CLIENT_AUTH commands. Fixes bug 40005; bugfix on 0.4.3.1-alpha.

3
src/feature/control/control_hs.c
View File

@ -291,7 +291,8 @@ handle_control_onion_client_auth_view(control_connection_t *conn,
if (argc >= 1) { if (argc >= 1) {
hsaddress = smartlist_get(args->args, 0); hsaddress = smartlist_get(args->args, 0);
if (!hs_address_is_valid(hsaddress)) { if (!hs_address_is_valid(hsaddress)) {
control_printf_endreply(conn, 512, "Invalid v3 addr \"%s\"", hsaddress); control_printf_endreply(conn, 512, "Invalid v3 address \"%s\"",
hsaddress);
goto err; goto err;
} }
} }

2
src/test/test_hs_control.c
View File

@ -393,7 +393,7 @@ test_hs_control_good_onion_client_auth_add(void *arg)
retval = handle_control_command(&conn, (uint32_t) strlen(args), args); retval = handle_control_command(&conn, (uint32_t) strlen(args), args);
tt_int_op(retval, OP_EQ, 0); tt_int_op(retval, OP_EQ, 0);
cp1 = buf_get_contents(TO_CONN(&conn)->outbuf, &sz); cp1 = buf_get_contents(TO_CONN(&conn)->outbuf, &sz);
tt_str_op(cp1, OP_EQ, "512 Invalid v3 addr \"house\"\r\n"); tt_str_op(cp1, OP_EQ, "512 Invalid v3 address \"house\"\r\n");
done: done:
tor_free(args); tor_free(args);