diff options
author | Micah Anderson <micah@riseup.net> | 2014-11-11 11:18:18 -0500 |
---|---|---|
committer | Micah Anderson <micah@riseup.net> | 2014-11-11 11:18:18 -0500 |
commit | c73b6c9ba513fea3e18b696e659049df69931171 (patch) | |
tree | a001cd6acbecead76b9a55f324278e8d077fe3d5 /src/libsodium/randombytes/sysrandom | |
parent | eabdc6e3d62550679476899dd861c23b63937142 (diff) |
update to 1.0.0-1 version of the package
Diffstat (limited to 'src/libsodium/randombytes/sysrandom')
-rw-r--r-- | src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c index 0ffcc2e..2979ef3 100644 --- a/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +++ b/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c @@ -83,12 +83,12 @@ safe_read(const int fd, void * const buf_, size_t count) assert(count > (size_t) 0U); do { while ((readnb = read(fd, buf, count)) < (ssize_t) 0 && - errno == EINTR); + errno == EINTR); /* LCOV_EXCL_LINE */ if (readnb < (ssize_t) 0) { - return readnb; + return readnb; /* LCOV_EXCL_LINE */ } if (readnb == (ssize_t) 0) { - break; + break; /* LCOV_EXCL_LINE */ } count -= (size_t) readnb; buf += readnb; @@ -102,6 +102,7 @@ safe_read(const int fd, void * const buf_, size_t count) static int randombytes_sysrandom_random_dev_open(void) { +/* LCOV_EXCL_START */ struct stat st; static const char *devices[] = { # ifndef USE_BLOCKING_RANDOM @@ -123,6 +124,7 @@ randombytes_sysrandom_random_dev_open(void) } while (*device != NULL); return -1; +/* LCOV_EXCL_STOP */ } static void @@ -132,7 +134,7 @@ randombytes_sysrandom_init(void) if ((stream.random_data_source_fd = randombytes_sysrandom_random_dev_open()) == -1) { - abort(); + abort(); /* LCOV_EXCL_LINE */ } errno = errno_save; } @@ -203,14 +205,14 @@ randombytes_sysrandom_buf(void * const buf, const size_t size) #endif #ifndef _WIN32 if (safe_read(stream.random_data_source_fd, buf, size) != (ssize_t) size) { - abort(); + abort(); /* LCOV_EXCL_LINE */ } #else if (size > 0xffffffff) { - abort(); + abort(); /* LCOV_EXCL_LINE */ } if (! RtlGenRandom((PVOID) buf, (ULONG) size)) { - abort(); + abort(); /* LCOV_EXCL_LINE */ } #endif } @@ -235,7 +237,7 @@ randombytes_sysrandom_uniform(const uint32_t upper_bound) if (r >= min) { break; } - } + } /* LCOV_EXCL_LINE */ return r % upper_bound; } |