From f9c7a5e6fb44cfd67c3cb6bd33dfaa17fcc7378f Mon Sep 17 00:00:00 2001 From: Flavio Ceolin Date: Mon, 9 Oct 2023 15:22:18 -0700 Subject: [PATCH] kernel: random: Rename early random get function Rename z_early_boot_rand_get with z_early_rand_get to get consistent with other early functions. Signed-off-by: Flavio Ceolin --- kernel/include/kernel_internal.h | 2 +- kernel/init.c | 4 ++-- kernel/thread.c | 2 +- tests/crypto/rand32/src/main.c | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/kernel/include/kernel_internal.h b/kernel/include/kernel_internal.h index 3c379559f72..711313b5ce7 100644 --- a/kernel/include/kernel_internal.h +++ b/kernel/include/kernel_internal.h @@ -149,7 +149,7 @@ extern void smp_timer_init(void); #endif #endif -extern void z_early_boot_rand_get(uint8_t *buf, size_t length); +extern void z_early_rand_get(uint8_t *buf, size_t length); #if CONFIG_STACK_POINTER_RANDOM extern int z_stack_adjust_initialized; diff --git a/kernel/init.c b/kernel/init.c index 536756268b3..7ea56714192 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -510,7 +510,7 @@ static FUNC_NORETURN void switch_to_main_thread(char *stack_ptr) #if defined(CONFIG_ENTROPY_HAS_DRIVER) || defined(CONFIG_TEST_RANDOM_GENERATOR) __boot_func -void z_early_boot_rand_get(uint8_t *buf, size_t length) +void z_early_rand_get(uint8_t *buf, size_t length) { #ifdef CONFIG_ENTROPY_HAS_DRIVER const struct device *const entropy = DEVICE_DT_GET_OR_NULL(DT_CHOSEN(zephyr_entropy)); @@ -592,7 +592,7 @@ FUNC_NORETURN void z_cstart(void) #ifdef CONFIG_STACK_CANARIES uintptr_t stack_guard; - z_early_boot_rand_get((uint8_t *)&stack_guard, sizeof(stack_guard)); + z_early_rand_get((uint8_t *)&stack_guard, sizeof(stack_guard)); __stack_chk_guard = stack_guard; __stack_chk_guard <<= 8; #endif /* CONFIG_STACK_CANARIES */ diff --git a/kernel/thread.c b/kernel/thread.c index f19c502a3ff..2703116aca5 100644 --- a/kernel/thread.c +++ b/kernel/thread.c @@ -464,7 +464,7 @@ static size_t random_offset(size_t stack_size) size_t random_val; if (!z_stack_adjust_initialized) { - z_early_boot_rand_get((uint8_t *)&random_val, sizeof(random_val)); + z_early_rand_get((uint8_t *)&random_val, sizeof(random_val)); } else { sys_rand_get((uint8_t *)&random_val, sizeof(random_val)); } diff --git a/tests/crypto/rand32/src/main.c b/tests/crypto/rand32/src/main.c index 39cf40543bc..1f2492e69e3 100644 --- a/tests/crypto/rand32/src/main.c +++ b/tests/crypto/rand32/src/main.c @@ -8,7 +8,7 @@ /* * This tests the following random number routines: - * void z_early_boot_rand_get(uint8_t *buf, size_t length) + * void z_early_rand_get(uint8_t *buf, size_t length) * uint32_t sys_rand32_get(void); */ @@ -35,11 +35,11 @@ ZTEST(rand32_common, test_rand32) /* Test early boot random number generation function */ /* Cover the case, where argument "length" is < size of "size_t" */ - z_early_boot_rand_get((uint8_t *)&tmp, (size_t)1); - z_early_boot_rand_get((uint8_t *)&last_gen, sizeof(last_gen)); - z_early_boot_rand_get((uint8_t *)&gen, sizeof(gen)); + z_early_rand_get((uint8_t *)&tmp, (size_t)1); + z_early_rand_get((uint8_t *)&last_gen, sizeof(last_gen)); + z_early_rand_get((uint8_t *)&gen, sizeof(gen)); zassert_true(last_gen != gen && last_gen != tmp && tmp != gen, - "z_early_boot_rand_get failed"); + "z_early_rand_get failed"); /* * Test subsequently calls sys_rand32_get(), checking