From 321dc403e1923484c9479dde55e0324cc82a6e36 Mon Sep 17 00:00:00 2001 From: Arowa Suliman Date: Sat, 18 Sep 2021 23:24:29 -0700 Subject: [PATCH] Replace "dummy" with "stub" in crypto/random Replace the word "dummy" with the inclusive word "stub". Signed-off-by: Arowa Suliman --- src/crypto/random.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/src/crypto/random.c b/src/crypto/random.c index 1cabf3f4b..548b60dba 100644 --- a/src/crypto/random.c +++ b/src/crypto/random.c @@ -49,9 +49,9 @@ static u32 pool[POOL_WORDS]; static unsigned int input_rotate = 0; static unsigned int pool_pos = 0; -static u8 dummy_key[20]; +static u8 stub_key[20]; #ifdef __linux__ -static size_t dummy_key_avail = 0; +static size_t stub_key_avail = 0; static int random_fd = -1; #endif /* __linux__ */ static unsigned int own_pool_ready = 0; @@ -109,13 +109,13 @@ static void random_extract(u8 *out) u32 buf[POOL_WORDS / 2]; /* First, add hash back to pool to make backtracking more difficult. */ - hmac_sha1(dummy_key, sizeof(dummy_key), (const u8 *) pool, + hmac_sha1(stub_key, sizeof(stub_key), (const u8 *) pool, sizeof(pool), hash); random_mix_pool(hash, sizeof(hash)); /* Hash half the pool to extra data */ for (i = 0; i < POOL_WORDS / 2; i++) buf[i] = pool[(pool_pos - i) & POOL_WORDS_MASK]; - hmac_sha1(dummy_key, sizeof(dummy_key), (const u8 *) buf, + hmac_sha1(stub_key, sizeof(stub_key), (const u8 *) buf, sizeof(buf), hash); /* * Fold the hash to further reduce any potential output pattern. @@ -227,7 +227,7 @@ int random_pool_ready(void) * some key derivation operations to proceed. */ - if (dummy_key_avail == sizeof(dummy_key)) + if (stub_key_avail == sizeof(stub_key)) return 1; /* Already initialized - good to continue */ /* @@ -238,8 +238,8 @@ int random_pool_ready(void) */ #ifdef CONFIG_GETRANDOM - res = getrandom(dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail, GRND_NONBLOCK); + res = getrandom(stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail, GRND_NONBLOCK); if (res < 0) { if (errno == ENOSYS) { wpa_printf(MSG_DEBUG, @@ -263,8 +263,8 @@ int random_pool_ready(void) return -1; } - res = read(fd, dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail); + res = read(fd, stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail); if (res < 0) { wpa_printf(MSG_ERROR, "random: Cannot read from /dev/random: %s", @@ -275,10 +275,10 @@ int random_pool_ready(void) } wpa_printf(MSG_DEBUG, "random: Got %u/%u random bytes", (unsigned) res, - (unsigned) (sizeof(dummy_key) - dummy_key_avail)); - dummy_key_avail += res; + (unsigned) (sizeof(stub_key) - stub_key_avail)); + stub_key_avail += res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { if (own_pool_ready < MIN_READY_MARK) own_pool_ready = MIN_READY_MARK; random_write_entropy(); @@ -287,7 +287,7 @@ int random_pool_ready(void) wpa_printf(MSG_INFO, "random: Only %u/%u bytes of strong " "random data available", - (unsigned) dummy_key_avail, (unsigned) sizeof(dummy_key)); + (unsigned) stub_key_avail, (unsigned) sizeof(stub_key)); if (own_pool_ready >= MIN_READY_MARK || total_collected + 10 * own_pool_ready > MIN_COLLECT_ENTROPY) { @@ -331,13 +331,13 @@ static void random_read_fd(int sock, void *eloop_ctx, void *sock_ctx) { ssize_t res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { random_close_fd(); return; } - res = read(sock, dummy_key + dummy_key_avail, - sizeof(dummy_key) - dummy_key_avail); + res = read(sock, stub_key + stub_key_avail, + sizeof(stub_key) - stub_key_avail); if (res < 0) { wpa_printf(MSG_ERROR, "random: Cannot read from /dev/random: " "%s", strerror(errno)); @@ -346,10 +346,10 @@ static void random_read_fd(int sock, void *eloop_ctx, void *sock_ctx) wpa_printf(MSG_DEBUG, "random: Got %u/%u bytes from /dev/random", (unsigned) res, - (unsigned) (sizeof(dummy_key) - dummy_key_avail)); - dummy_key_avail += res; + (unsigned) (sizeof(stub_key) - stub_key_avail)); + stub_key_avail += res; - if (dummy_key_avail == sizeof(dummy_key)) { + if (stub_key_avail == sizeof(stub_key)) { random_close_fd(); if (own_pool_ready < MIN_READY_MARK) own_pool_ready = MIN_READY_MARK; @@ -440,9 +440,9 @@ void random_init(const char *entropy_file) #ifdef CONFIG_GETRANDOM { - u8 dummy; + u8 stub; - if (getrandom(&dummy, 0, GRND_NONBLOCK) == 0 || + if (getrandom(&stub, 0, GRND_NONBLOCK) == 0 || errno != ENOSYS) { wpa_printf(MSG_DEBUG, "random: getrandom() support available");