mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.1'

Browse source
This commit is contained in:
Nick Mathewson 2019-09-02 14:11:32 -04:00
commit 01bda9bed1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug12399 Normal file
View file

@ -0,0 +1,3 @@
o Minor bugfixes (logging):
- Change log level of message "Hash of session info was not as expected"
to LOG_PROTOCOL_WARN. Fixes bug 12399; bugfix on 0.1.1.10-alpha.

3
src/feature/rend/rendmid.c
View file

@ -71,7 +71,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
goto err; goto err;
} }
if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) { if (tor_memneq(expected_digest, request+2+asn1len, DIGEST_LEN)) {
log_warn(LD_PROTOCOL, "Hash of session info was not as expected."); log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Hash of session info was not as expected.");
reason = END_CIRC_REASON_TORPROTOCOL; reason = END_CIRC_REASON_TORPROTOCOL;
goto err; goto err;
} }