diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-24 15:12:16 -0400 |
| commit | 91c6bc160b1d2be60e5756f13d28ba469049351c (patch) | |
| tree | 9bd25229bde6e1f7960665c130fa650d3e167a4b /src/or/control.c | |
| parent | b5c5086aba2fa24649fcbda7db80ef599d56e3c6 (diff) | |
| parent | dc0264f6593116da413dc5ca6c424dcff36fbbd2 (diff) | |
| download | tor-91c6bc160b1d2be60e5756f13d28ba469049351c.tar.gz tor-91c6bc160b1d2be60e5756f13d28ba469049351c.zip | |
Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'
Diffstat (limited to 'src/or/control.c')
| -rw-r--r-- | src/or/control.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/control.c b/src/or/control.c index 87d6d00fcc..bc173a6e1c 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4140,7 +4140,7 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len, /* Extract the first argument (either HSAddress or DescID). */ arg1 = smartlist_get(args, 0); /* Test if it's an HS address without the .onion part. */ - if (rend_valid_service_id(arg1)) { + if (rend_valid_v2_service_id(arg1)) { hsaddress = arg1; } else if (strcmpstart(arg1, v2_str) == 0 && rend_valid_descriptor_id(arg1 + v2_str_len) && @@ -4779,7 +4779,7 @@ handle_control_del_onion(control_connection_t *conn, return 0; const char *service_id = smartlist_get(args, 0); - if (!rend_valid_service_id(service_id)) { + if (!rend_valid_v2_service_id(service_id)) { connection_printf_to_buf(conn, "512 Malformed Onion Service id\r\n"); goto out; } |