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

salsa20_random(): just abort(3) if the pid changes and _stir() wasn't called

Browse Source
This commit is contained in:
Frank Denis 2015-06-01 12:29:02 +02:00
parent 2efa85d283
commit 3c3635e53a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c
View File

@ -271,6 +271,9 @@ randombytes_salsa20_random_stir(void)
stream.key[i] ^= m0[i];
}
sodium_memzero(m0, sizeof m0);
#ifndef _MSC_VER
stream.pid = getpid();
#endif
}
static void
@ -281,11 +284,10 @@ randombytes_salsa20_random_stir_if_needed(void)
randombytes_salsa20_random_stir();
}
#else
const pid_t pid = getpid();
if (stream.initialized == 0 || stream.pid != pid) {
stream.pid = pid;
if (stream.initialized == 0) {
randombytes_salsa20_random_stir();
} else if (stream.pid != getpid()) {
abort();
}
#endif
}
@ -339,6 +341,7 @@ randombytes_salsa20_random_close(void)
close(stream.random_data_source_fd) == 0) {
stream.random_data_source_fd = -1;
stream.initialized = 0;
stream.pid = (pid_t) 0;
ret = 0;
}
# ifdef SYS_getrandom