summaryrefslogtreecommitdiff
path: root/openbsd-compat/arc4random.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2022-09-02 14:17:28 +1000
committerDarren Tucker <dtucker@dtucker.net>2022-09-02 14:30:38 +1000
commitc83e467ead67a8cb48ef4bec8085d6fb880a2ff4 (patch)
treea4a4b82fa50b7e597b5f6892d1ed99b3348af931 /openbsd-compat/arc4random.c
parent5f45c2395c60865e59fa44152ff1d003a128c5bc (diff)
downloadopenssh-git-c83e467ead67a8cb48ef4bec8085d6fb880a2ff4.tar.gz
Remove arc4random_uniform from arc4random.c
This was previously moved into its own file (matching OpenBSD) which prematurely committed in commit 73541f2.
Diffstat (limited to 'openbsd-compat/arc4random.c')
-rw-r--r--openbsd-compat/arc4random.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/openbsd-compat/arc4random.c b/openbsd-compat/arc4random.c
index 2f91c2b2..2751fb83 100644
--- a/openbsd-compat/arc4random.c
+++ b/openbsd-compat/arc4random.c
@@ -242,44 +242,6 @@ arc4random_buf(void *_buf, size_t n)
}
#endif /* !defined(HAVE_ARC4RANDOM_BUF) && defined(HAVE_ARC4RANDOM) */
-#ifndef HAVE_ARC4RANDOM_UNIFORM
-/*
- * Calculate a uniformly distributed random number less than upper_bound
- * avoiding "modulo bias".
- *
- * Uniformity is achieved by generating new random numbers until the one
- * returned is outside the range [0, 2**32 % upper_bound). This
- * guarantees the selected random number will be inside
- * [2**32 % upper_bound, 2**32) which maps back to [0, upper_bound)
- * after reduction modulo upper_bound.
- */
-u_int32_t
-arc4random_uniform(u_int32_t upper_bound)
-{
- u_int32_t r, min;
-
- if (upper_bound < 2)
- return 0;
-
- /* 2**32 % x == (2**32 - x) % x */
- min = -upper_bound % upper_bound;
-
- /*
- * This could theoretically loop forever but each retry has
- * p > 0.5 (worst case, usually far better) of selecting a
- * number inside the range we need, so it should rarely need
- * to re-roll.
- */
- for (;;) {
- r = arc4random();
- if (r >= min)
- break;
- }
-
- return r % upper_bound;
-}
-#endif /* !HAVE_ARC4RANDOM_UNIFORM */
-
#if 0
/*-------- Test code for i386 --------*/
#include <stdio.h>