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

More abort() -> sodium_misuse()

Browse Source 
Keep the abort() call on the hash function, which should never fail.
This commit is contained in:
Frank Denis 2017-07-16 19:51:08 +02:00
parent ea9281cb03
commit a0e997b8ae
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
# include <poll.h> # include <poll.h>
#endif #endif
#include "core.h"
#include "crypto_core_salsa20.h" #include "crypto_core_salsa20.h"
#include "crypto_generichash.h" #include "crypto_generichash.h"
#include "crypto_stream_salsa20.h" #include "crypto_stream_salsa20.h"
@ -98,7 +99,7 @@ sodium_hrtime(void)
struct timeval tv; struct timeval tv;
if (gettimeofday(&tv, NULL) != 0) { if (gettimeofday(&tv, NULL) != 0) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("sodium_hrtime(): gettimeofday() failed"); /* LCOV_EXCL_LINE */
} }
ts = ((uint64_t) tv.tv_sec) * 1000000U + (uint64_t) tv.tv_usec; ts = ((uint64_t) tv.tv_sec) * 1000000U + (uint64_t) tv.tv_usec;
} }
@ -277,7 +278,7 @@ randombytes_salsa20_random_init(void)
if ((stream.random_data_source_fd = if ((stream.random_data_source_fd =
randombytes_salsa20_random_random_dev_open()) == -1) { randombytes_salsa20_random_random_dev_open()) == -1) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("randombytes_salsa20_random_init(): unable to open the random device"); /* LCOV_EXCL_LINE */
} }
errno = errno_save; errno = errno_save;
# endif /* HAVE_SAFE_ARC4RANDOM */ # endif /* HAVE_SAFE_ARC4RANDOM */
@ -331,24 +332,24 @@ randombytes_salsa20_random_stir(void)
# elif defined(SYS_getrandom) && defined(__NR_getrandom) # elif defined(SYS_getrandom) && defined(__NR_getrandom)
if (stream.getrandom_available != 0) { if (stream.getrandom_available != 0) {
if (randombytes_linux_getrandom(m0, sizeof m0) != 0) { if (randombytes_linux_getrandom(m0, sizeof m0) != 0) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("randombytes_salsa20_random_stir(): linux getrandom() failed"); /* LCOV_EXCL_LINE */
} }
} else if (stream.random_data_source_fd == -1 || } else if (stream.random_data_source_fd == -1 ||
safe_read(stream.random_data_source_fd, m0, safe_read(stream.random_data_source_fd, m0,
sizeof m0) != (ssize_t) sizeof m0) { sizeof m0) != (ssize_t) sizeof m0) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("randombytes_salsa20_random_stir(): unable to read from the random device"); /* LCOV_EXCL_LINE */
} }
# else # else
if (stream.random_data_source_fd == -1 || if (stream.random_data_source_fd == -1 ||
safe_read(stream.random_data_source_fd, m0, safe_read(stream.random_data_source_fd, m0,
sizeof m0) != (ssize_t) sizeof m0) { sizeof m0) != (ssize_t) sizeof m0) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("randombytes_salsa20_random_stir(): unable to read from the random device"); /* LCOV_EXCL_LINE */
} }
# endif # endif
#else /* _WIN32 */ #else /* _WIN32 */
if (! RtlGenRandom((PVOID) m0, (ULONG) sizeof m0)) { if (! RtlGenRandom((PVOID) m0, (ULONG) sizeof m0)) {
abort(); /* LCOV_EXCL_LINE */ sodium_misuse("randombytes_salsa20_random_stir(): RtlGenRandom() failed"); /* LCOV_EXCL_LINE */
} }
#endif #endif
if (crypto_generichash(stream.key, sizeof stream.key, k0, sizeof_k0, if (crypto_generichash(stream.key, sizeof stream.key, k0, sizeof_k0,
@ -370,7 +371,7 @@ randombytes_salsa20_random_stir_if_needed(void)
if (stream.initialized == 0) { if (stream.initialized == 0) {
randombytes_salsa20_random_stir(); randombytes_salsa20_random_stir();
} else if (stream.pid != getpid()) { } else if (stream.pid != getpid()) {
abort(); sodium_misuse("randombytes_salsa20_random_stir_if_needed(): stirring is required after fork()"); /* LCOV_EXCL_LINE */
} }
#else #else
if (stream.initialized == 0) { if (stream.initialized == 0) {