Fixup whitespace issues from 3122 commit

This commit is contained in:
Nick Mathewson 2011-05-15 20:12:01 -04:00
parent 4c3853aca8
commit bc44393eb5
2 changed files with 6 additions and 4 deletions

View File

@ -1288,9 +1288,10 @@ options_act(or_options_t *old_options)
if (revise_trackexithosts)
addressmap_clear_excluded_trackexithosts(options);
if (old_options->AutomapHostsOnResolve && !options->AutomapHostsOnResolve) {
revise_automap_entries = 1;
} else if (options->AutomapHostsOnResolve) {
if (!options->AutomapHostsOnResolve) {
if (old_options->AutomapHostsOnResolve)
revise_automap_entries = 1;
} else {
if (!smartlist_strings_eq(old_options->AutomapHostsSuffixes,
options->AutomapHostsSuffixes))
revise_automap_entries = 1;

View File

@ -2213,7 +2213,8 @@ networkstatus_add_detached_signatures(networkstatus_t *target,
}
for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
if (fast_memeq(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
if (fast_memeq(target->digests.d[alg], digests->d[alg],
DIGEST256_LEN)) {
++n_matches;
} else {
*msg_out = "Mismatched digest.";