mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

Mark some unreachable lines in crypto.c

Browse source
This commit is contained in:
Nick Mathewson 2016-05-03 13:47:33 -04:00
parent 7a5f15b6e0
commit c395334879
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/common/crypto.c
View file

@ -2639,6 +2639,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
} while (ret == -1 && ((errno == EINTR) ||(errno == EAGAIN))); } while (ret == -1 && ((errno == EINTR) ||(errno == EAGAIN)));
if (PREDICT_UNLIKELY(ret == -1)) { if (PREDICT_UNLIKELY(ret == -1)) {
/* LCOV_EXCL_START we can't actually make the syscall fail in testing. */
tor_assert(errno != EAGAIN); tor_assert(errno != EAGAIN);
tor_assert(errno != EINTR); tor_assert(errno != EINTR);
@ -2646,6 +2647,7 @@ crypto_strongest_rand_syscall(uint8_t *out, size_t out_len)
log_warn(LD_CRYPTO, "Can't get entropy from getrandom()."); log_warn(LD_CRYPTO, "Can't get entropy from getrandom().");
getrandom_works = 0; /* Don't bother trying again. */ getrandom_works = 0; /* Don't bother trying again. */
return -1; return -1;
/* LCOV_EXCL_STOP */
} }
tor_assert(ret == (long)out_len); tor_assert(ret == (long)out_len);
@ -2699,10 +2701,13 @@ crypto_strongest_rand_fallback(uint8_t *out, size_t out_len)
n = read_all(fd, (char*)out, out_len, 0); n = read_all(fd, (char*)out, out_len, 0);
close(fd); close(fd);
if (n != out_len) { if (n != out_len) {
/* LCOV_EXCL_START
* We can't make /dev/foorandom actually fail. */
log_warn(LD_CRYPTO, log_warn(LD_CRYPTO,
"Error reading from entropy source (read only %lu bytes).", "Error reading from entropy source (read only %lu bytes).",
(unsigned long)n); (unsigned long)n);
return -1; return -1;
/* LCOV_EXCL_STOP */
} }
return 0; return 0;
@ -2815,7 +2820,7 @@ crypto_seed_rng(void)
* functions. If one succeeds, we'll accept the RNG as seeded. */ * functions. If one succeeds, we'll accept the RNG as seeded. */
rand_poll_ok = RAND_poll(); rand_poll_ok = RAND_poll();
if (rand_poll_ok == 0) if (rand_poll_ok == 0)
log_warn(LD_CRYPTO, "RAND_poll() failed."); log_warn(LD_CRYPTO, "RAND_poll() failed."); // LCOV_EXCL_LINE
load_entropy_ok = !crypto_strongest_rand_raw(buf, sizeof(buf)); load_entropy_ok = !crypto_strongest_rand_raw(buf, sizeof(buf));
if (load_entropy_ok) { if (load_entropy_ok) {