diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:39:45 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:39:45 -0400 |
| commit | 9fba014e3f7f89520841b65b8b038e5fb931b1d6 (patch) | |
| tree | 2197904844e7ae25b4a2d6465c2aa0cca1798019 /src/or/relay.c | |
| parent | 6d5478a8a7734553fc84574e725625610f46dc8c (diff) | |
| parent | 8fb38331c3213caef2d2e003e02cdb361504f14f (diff) | |
| download | tor-9fba014e3f7f89520841b65b8b038e5fb931b1d6.tar.gz tor-9fba014e3f7f89520841b65b8b038e5fb931b1d6.zip | |
Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023
Conflicts in various places, mainly node-related. Resolved them in
favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022.
src/common/Makefile.am
src/or/circuitlist.c
src/or/connection_edge.c
src/or/directory.c
src/or/microdesc.c
src/or/networkstatus.c
src/or/router.c
src/or/routerlist.c
src/test/test_util.c
Diffstat (limited to 'src/or/relay.c')
| -rw-r--r-- | src/or/relay.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index e5bc310fed..cf531169e7 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -134,7 +134,7 @@ relay_digest_matches(crypto_digest_env_t *digest, cell_t *cell) crypto_digest_add_bytes(digest, (char*) cell->payload, CELL_PAYLOAD_SIZE); crypto_digest_get_digest(digest, calculated_integrity, 4); - if (memcmp(received_integrity, calculated_integrity, 4)) { + if (tor_memneq(received_integrity, calculated_integrity, 4)) { // log_fn(LOG_INFO,"Recognized=0 but bad digest. Not recognizing."); // (%d vs %d).", received_integrity, calculated_integrity); /* restore digest to its old form */ |