nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.2' into maint-0.3.3

Browse Source
This commit is contained in:
Nick Mathewson 2018-06-29 13:49:43 -04:00
commit 36c372581f
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/test_channelpadding.c
View File

@ -701,6 +701,7 @@ test_channelpadding_consensus(void *arg)
memcpy(relay->identity_digest,
((channel_tls_t *)chan)->conn->identity_digest, DIGEST_LEN);
smartlist_add(current_md_consensus->routerstatus_list, relay);
relay = NULL; /* Prevent double-free */
tried_to_write_cell = 0;
decision = channelpadding_decide_to_pad_channel(chan);

3
src/test/test_hs_descriptor.c
View File

@ -208,6 +208,7 @@ test_link_specifier(void *arg)
tt_int_op(link_specifier_get_un_ipv4_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
ls = NULL;
tor_free(b64);
}
@ -238,6 +239,7 @@ test_link_specifier(void *arg)
tt_int_op(link_specifier_get_un_ipv6_port(ls), OP_EQ, spec.u.ap.port);
link_specifier_free(ls);
ls = NULL;
tor_free(b64);
}
@ -265,6 +267,7 @@ test_link_specifier(void *arg)
tt_mem_op(spec.u.legacy_id, OP_EQ, id, DIGEST_LEN);
link_specifier_free(ls);
ls = NULL;
tor_free(b64);
}

1
src/test/test_shared_random.c
View File

@ -872,6 +872,7 @@ test_sr_setup_commits(void)
/* Now during REVEAL phase save commit D by restoring its reveal. */
set_sr_phase(SR_PHASE_REVEAL);
save_commit_to_state(place_holder);
place_holder = NULL;
tt_str_op(commit_d->encoded_reveal, OP_EQ,
"DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD");
/* Go back to an empty encoded reveal value. */