mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-24 04:13:28 +01:00
Merge remote-tracking branch 'origin/maint-0.2.2'
This commit is contained in:
commit
42b15a0aaa
6
changes/bug3208
Normal file
6
changes/bug3208
Normal file
@ -0,0 +1,6 @@
|
||||
o Removed options:
|
||||
- Remove undocumented option "-F" from tor-resolve: it hasn't done
|
||||
anything since 0.2.1.16-rc.
|
||||
|
||||
o Minor bugfixes:
|
||||
- Fix warnings from GCC 4.6's "-Wunused-but-set-variable" option.
|
@ -3782,7 +3782,6 @@ void
|
||||
entry_guards_compute_status(or_options_t *options, time_t now)
|
||||
{
|
||||
int changed = 0;
|
||||
int severity = LOG_DEBUG;
|
||||
digestmap_t *reasons;
|
||||
|
||||
if (! entry_guards)
|
||||
@ -3809,8 +3808,6 @@ entry_guards_compute_status(or_options_t *options, time_t now)
|
||||
if (remove_dead_entry_guards(now))
|
||||
changed = 1;
|
||||
|
||||
severity = changed ? LOG_DEBUG : LOG_INFO;
|
||||
|
||||
if (changed) {
|
||||
SMARTLIST_FOREACH_BEGIN(entry_guards, entry_guard_t *, entry) {
|
||||
const char *reason = digestmap_get(reasons, entry->identity);
|
||||
|
@ -649,6 +649,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
|
||||
|
||||
/* XXX maybe act on my_apparent_addr, if the source is sufficiently
|
||||
* trustworthy. */
|
||||
(void)my_apparent_addr;
|
||||
|
||||
if (connection_or_set_state_open(conn)<0)
|
||||
connection_mark_for_close(TO_CONN(conn));
|
||||
|
@ -3228,7 +3228,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
|
||||
{
|
||||
const char *status;
|
||||
char extended_buf[96];
|
||||
int providing_reason=0;
|
||||
if (!EVENT_IS_INTERESTING(EVENT_CIRCUIT_STATUS))
|
||||
return 0;
|
||||
tor_assert(circ);
|
||||
@ -3252,7 +3251,6 @@ control_event_circuit_status(origin_circuit_t *circ, circuit_status_event_t tp,
|
||||
const char *reason_str = circuit_end_reason_to_control_string(reason_code);
|
||||
char *reason = NULL;
|
||||
size_t n=strlen(extended_buf);
|
||||
providing_reason=1;
|
||||
if (!reason_str) {
|
||||
reason = tor_malloc(16);
|
||||
tor_snprintf(reason, 16, "UNKNOWN_%d", reason_code);
|
||||
|
@ -2005,7 +2005,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
|
||||
router_get_trusteddirserver_by_digest(conn->identity_digest);
|
||||
char *rejected_hdr = http_get_header(headers,
|
||||
"X-Descriptor-Not-New: ");
|
||||
int rejected = 0;
|
||||
if (rejected_hdr) {
|
||||
if (!strcmp(rejected_hdr, "Yes")) {
|
||||
log_info(LD_GENERAL,
|
||||
@ -2018,7 +2017,6 @@ connection_dir_client_reached_eof(dir_connection_t *conn)
|
||||
* last descriptor, not on the published time of the last
|
||||
* descriptor. If those are different, that's a bad thing to
|
||||
* do. -NM */
|
||||
rejected = 1;
|
||||
}
|
||||
tor_free(rejected_hdr);
|
||||
}
|
||||
|
@ -1585,7 +1585,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
|
||||
* is the same flag as votes[j]->known_flags[b]. */
|
||||
int *named_flag; /* Index of the flag "Named" for votes[j] */
|
||||
int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */
|
||||
int chosen_named_idx, chosen_unnamed_idx;
|
||||
int chosen_named_idx;
|
||||
|
||||
strmap_t *name_to_id_map = strmap_new();
|
||||
char conflict[DIGEST_LEN];
|
||||
@ -1603,7 +1603,6 @@ networkstatus_compute_consensus(smartlist_t *votes,
|
||||
for (i = 0; i < smartlist_len(votes); ++i)
|
||||
unnamed_flag[i] = named_flag[i] = -1;
|
||||
chosen_named_idx = smartlist_string_pos(flags, "Named");
|
||||
chosen_unnamed_idx = smartlist_string_pos(flags, "Unnamed");
|
||||
|
||||
/* Build the flag index. */
|
||||
SMARTLIST_FOREACH(votes, networkstatus_t *, v,
|
||||
|
@ -1028,6 +1028,9 @@ request_parse(u8 *packet, ssize_t length, struct evdns_server_port *port, struct
|
||||
GET16(answers);
|
||||
GET16(authority);
|
||||
GET16(additional);
|
||||
(void)additional;
|
||||
(void)authority;
|
||||
(void)answers;
|
||||
|
||||
if (flags & 0x8000) return -1; /* Must not be an answer. */
|
||||
flags &= 0x0110; /* Only RD and CD get preserved. */
|
||||
|
@ -69,7 +69,7 @@ test_crypto_rng(void)
|
||||
uint64_t big;
|
||||
char *host;
|
||||
j = crypto_rand_int(100);
|
||||
if (i < 0 || i >= 100)
|
||||
if (j < 0 || j >= 100)
|
||||
allok = 0;
|
||||
big = crypto_rand_uint64(U64_LITERAL(1)<<40);
|
||||
if (big >= (U64_LITERAL(1)<<40))
|
||||
@ -240,11 +240,13 @@ test_crypto_sha(void)
|
||||
/* Test SHA-1 with a test vector from the specification. */
|
||||
i = crypto_digest(data, "abc", 3);
|
||||
test_memeq_hex(data, "A9993E364706816ABA3E25717850C26C9CD0D89D");
|
||||
tt_int_op(i, ==, 0);
|
||||
|
||||
/* Test SHA-256 with a test vector from the specification. */
|
||||
i = crypto_digest256(data, "abc", 3, DIGEST_SHA256);
|
||||
test_memeq_hex(data, "BA7816BF8F01CFEA414140DE5DAE2223B00361A3"
|
||||
"96177A9CB410FF61F20015AD");
|
||||
tt_int_op(i, ==, 0);
|
||||
|
||||
/* Test HMAC-SHA-1 with test cases from RFC2202. */
|
||||
|
||||
|
@ -319,7 +319,7 @@ main(int argc, char **argv)
|
||||
{
|
||||
uint32_t sockshost;
|
||||
uint16_t socksport = 0, port_option = 0;
|
||||
int isSocks4 = 0, isVerbose = 0, isReverse = 0, force = 0;
|
||||
int isSocks4 = 0, isVerbose = 0, isReverse = 0;
|
||||
char **arg;
|
||||
int n_args;
|
||||
struct in_addr a;
|
||||
@ -349,8 +349,6 @@ main(int argc, char **argv)
|
||||
isSocks4 = 0;
|
||||
else if (!strcmp("-x", arg[0]))
|
||||
isReverse = 1;
|
||||
else if (!strcmp("-F", arg[0]))
|
||||
force = 1;
|
||||
else if (!strcmp("-p", arg[0])) {
|
||||
int p;
|
||||
if (n_args < 2) {
|
||||
|
Loading…
Reference in New Issue
Block a user