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

Merge branch 'bug24247_032' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-13 11:19:09 -05:00
commit cf1e6ad2d7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug24247 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes (fuzzing):
- Fix a bug in our fuzzing mock replacement for crypto_pk_checksig(), to
correctly handle cases where a caller gives it an RSA key of under 160
bits. (This is not actually a bug in Tor itself, but wrather in our
fuzzing code.) Fixes bug 24247; bugfix on 0.3.0.3-alpha.
Found by OSS-Fuzz as issue 4177.

5
src/test/fuzz/fuzzing_common.c
View File

@ -28,8 +28,9 @@ mock_crypto_pk_public_checksig__nocheck(const crypto_pk_t *env, char *to,
(void)fromlen; (void)fromlen;
/* We could look at from[0..fromlen-1] ... */ /* We could look at from[0..fromlen-1] ... */
tor_assert(tolen >= crypto_pk_keysize(env)); tor_assert(tolen >= crypto_pk_keysize(env));
memset(to, 0x01, 20); size_t siglen = MIN(20, crypto_pk_keysize(env));
return 20; memset(to, 0x01, siglen);
return (int)siglen;
} }
static int static int