further cleanup

Signed-off-by: Leah Rowe <leah@libreboot.org>

2 files changed, 19 insertions, 41 deletions

diff --git a/util/libreboot-utils/include/common.h b/util/libreboot-utils/include/common.h
index 71f28fad..5712d41a 100644
--- a/util/libreboot-utils/include/common.h
+++ b/util/libreboot-utils/include/common.h
@@ -392,7 +392,7 @@ void rset(void *buf, size_t n);
 void *mkrbuf(size_t n);
 char *mkrstr(size_t n);
 int win_lottery(void);
-size_t rsize(void);
+size_t rsize(size_t n);
 
 /* Helper functions for command: dump
  */
diff --git a/util/libreboot-utils/lib/rand.c b/util/libreboot-utils/lib/rand.c
index 58cb211e..1adf0f09 100644
--- a/util/libreboot-utils/lib/rand.c
+++ b/util/libreboot-utils/lib/rand.c
@@ -72,62 +72,40 @@
  * or your program dies.
  */
 
-#define MAX_ALLOC (2 << 16)
+#define MAX_ALLOC (1 << 17)
 
 int
 win_lottery(void) /* are u lucky? */
 {
-	size_t size = rsize();
-	size_t size2 = rsize();
 	char *s = NULL; 
+	size_t size[2] = { rsize(MAX_ALLOC), rsize(MAX_ALLOC) };
 
-	if (size &&
-	    size == size2 &&
-	    size <= MAX_ALLOC << 1) {
-
-		if (!memcmp(s = mkrbuf(size << 1),
-		    s + size, size))
-			size2 = 1; /* winner! */
-		else
-			size2 = 0;
-	} else {
+	if (!(size[0] && size[0] == size[1] &&
+	    size[0] <= MAX_ALLOC << 1))
 		return 0;
-	}
-
-	free_if_null(&s);
-	return (int)size2;
-}
-
-size_t
-rsize(void)
-{
-	size_t rval = 0;
 
-	/* clamp rand to prevent modulo bias */
-	size_t limit = SIZE_MAX - (SIZE_MAX % MAX_ALLOC);
+	if (!memcmp(s = mkrbuf(size[0] << 1),
+	    s + size[0], size[0]))
+		size[1] = 0; /* winner! */
 
-	do {
-		rset(&rval, sizeof(rval));
-	} while (rval >= limit);
-
-	return rval % MAX_ALLOC;
+	free_if_null(&s);
+	return abs((int)size[1]) ^ 1;
 }
 
-
 void *
 rmalloc(size_t *rval)
 {
-	/* clamp rand to prevent modulo bias */
-	size_t limit = SIZE_MAX - (SIZE_MAX % MAX_ALLOC);
-
-	if (if_err(rval == NULL, EFAULT))
-		return NULL;
+	return if_err(rval == NULL, EFAULT) ?
+	    NULL : mkrstr(*rval = rsize(MAX_ALLOC));
+}
 
-	do {
-		rset(rval, sizeof(*rval));
-	} while (*rval >= limit || *rval == 0);
+size_t
+rsize(size_t n)
+{
+	size_t rval = SIZE_MAX;
+	for (; rval >= SIZE_MAX - (SIZE_MAX % n); rset(&rval, sizeof(rval)));
 
-	return mkrstr(*rval %= MAX_ALLOC);
+	return rval % n;
 }
 
 char *