summaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-04-30 23:04:56 -0400
committerNick Mathewson <nickm@torproject.org>2020-04-30 23:04:56 -0400
commitb1c383e3e65ec539ebe4394652429f1954e3d805 (patch)
tree4e1cc8564029c77b7f4e326d5388d79afb451a42 /src/feature
parent6aaee6133d089611050a3507d7258486dcf97d1e (diff)
downloadtor-b1c383e3e65ec539ebe4394652429f1954e3d805.tar.gz
tor-b1c383e3e65ec539ebe4394652429f1954e3d805.zip
Fix a GCC 10.0.1 compilation error.
Do not try to stuff "HS_DESC_DECODE_GENERIC_ERROR" (-1) into a socks5_reply_status_t (enum). It doesn't actually make sense, and isn't one of our documented extensions. (This can only happen on a nonfatal assertion that we haven't seen, so it probably isn't happening in practice.) Fixes another case of bug 34077; bugfix on 0.4.3.1-alpha.
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/hs/hs_client.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/feature/hs/hs_client.c b/src/feature/hs/hs_client.c
index da1202b642..68d6619cea 100644
--- a/src/feature/hs/hs_client.c
+++ b/src/feature/hs/hs_client.c
@@ -1350,7 +1350,7 @@ client_desc_missing_bad_client_auth(const smartlist_t *entry_conns,
/* We should not be called with another type of status. Recover by
* sending a generic error. */
tor_assert_nonfatal_unreached();
- code = HS_DESC_DECODE_GENERIC_ERROR;
+ code = SOCKS5_GENERAL_ERROR;
}
entry_conn->socks_request->socks_extended_error_code = code;
connection_mark_unattached_ap(entry_conn, END_STREAM_REASON_MISC);
@@ -2493,4 +2493,3 @@ set_hs_client_auths_map(digest256map_t *map)
}
#endif /* defined(TOR_UNIT_TESTS) */
-