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.3' into release-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson 2020-05-04 10:25:52 -04:00
commit b762f168bf
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug34077 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (compiler warnings):
- Fix compilation warnings with GCC 10.0.1. Fixes bug 34077; bugfix on
0.4.0.3-alpha.

3
src/feature/dirauth/shared_random_state.c
View File

@ -1039,8 +1039,9 @@ sr_state_set_valid_after(time_t valid_after)
sr_phase_t
sr_state_get_phase(void)
{
void *ptr;
void *ptr=NULL;
state_query(SR_STATE_ACTION_GET, SR_STATE_OBJ_PHASE, NULL, &ptr);
tor_assert(ptr);
return *(sr_phase_t *) ptr;
}

3
src/feature/hs/hs_client.c
View File

@ -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) */