sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refine the memwipe() arguments check for 18089 a little more. 

We still silently ignore
     memwipe(NULL, ch, 0);
and
     memwipe(ptr, ch, 0);  /* for ptr != NULL */

But we now assert on:
     memwipe(NULL, ch, 30);
This commit is contained in:
Nick Mathewson 2016-01-19 08:28:58 -05:00
parent fb7d1f41b4
commit 6cb8c0fd4e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/crypto.c
View File

@ -2990,9 +2990,11 @@ secret_to_key(char *key_out, size_t key_out_len, const char *secret,
void
memwipe(void *mem, uint8_t byte, size_t sz)
{
if (mem == NULL || sz == 0) {
if (sz == 0) {
return;
}
/* If sz is nonzero, then mem must not be NULL. */
tor_assert(mem != NULL);
/* Data this large is likely to be an underflow. */
tor_assert(sz < SIZE_T_CEILING);