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

Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-29 16:44:50 -04:00
commit 41058dce95
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug12996 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Downgrade "Unexpected onionskin length after decryption" warning
to a protocol-warn, since there's nothing relay operators can do
about a client that sends them a malformed create cell. Resolves
bug 12996; bugfix on 0.0.6rc1.

3
src/or/onion_tap.c
View File

@ -122,7 +122,8 @@ onion_skin_TAP_server_handshake(
"Couldn't decrypt onionskin: client may be using old onion key"); "Couldn't decrypt onionskin: client may be using old onion key");
goto err; goto err;
} else if (len != DH_KEY_LEN) { } else if (len != DH_KEY_LEN) {
log_warn(LD_PROTOCOL, "Unexpected onionskin length after decryption: %ld", log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
"Unexpected onionskin length after decryption: %ld",
(long)len); (long)len);
goto err; goto err;
} }