cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initialize the base&aligned addresses in argon2's allocate_memory

Browse Source 
Also memzero() pseudo_rands, not the segments twice.
This commit is contained in:
Frank Denis 2017-07-29 18:54:52 +02:00
parent fc90887921
commit 52bfc0325b
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libsodium/crypto_pwhash/argon2/argon2-core.c
View File

@ -83,6 +83,7 @@ allocate_memory(block_region **region, uint32_t m_cost)
if (!*region) {
return ARGON2_MEMORY_ALLOCATION_ERROR; /* LCOV_EXCL_LINE */
}
(*region)->base = (*region)->memory = NULL;
#if defined(MAP_ANON) && defined(HAVE_MMAP)
if ((base = mmap(NULL, memory_size, PROT_READ | PROT_WRITE,
@ -139,7 +140,7 @@ clear_memory(argon2_instance_t *instance, int clear)
sizeof(block) * instance->memory_blocks);
}
if (instance->pseudo_rands != NULL) {
sodium_memzero(instance->region->memory,
sodium_memzero(instance->pseudo_rands,
sizeof(uint64_t) * instance->segment_length);
}
}