Merge branch 'tor-github/pr/611'

This commit is contained in:
George Kadianakis
2019-02-26 12:33:23 +02:00
12 changed files with 41 additions and 31 deletions
+2 -1
View File
@@ -4444,7 +4444,8 @@ handle_control_hsfetch(control_connection_t *conn, uint32_t len,
} else if (strcmpstart(arg1, v2_str) == 0 &&
rend_valid_descriptor_id(arg1 + v2_str_len) &&
base32_decode(digest, sizeof(digest), arg1 + v2_str_len,
REND_DESC_ID_V2_LEN_BASE32) == 0) {
REND_DESC_ID_V2_LEN_BASE32) ==
REND_DESC_ID_V2_LEN_BASE32) {
/* We have a well formed version 2 descriptor ID. Keep the decoded value
* of the id. */
desc_id = digest;