From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Wed, 19 Aug 2020 11:01:50 +0000 (+0300)
Subject: lib: Use i_rand_limit() helpers
X-Git-Tag: 2.3.13~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8705c0a82793dc54777ac37403c8fdad3e3528d;p=thirdparty%2Fdovecot%2Fcore.git

lib: Use i_rand_limit() helpers
---

diff --git a/src/lib/test-array.c b/src/lib/test-array.c
index 58e83708da..713da54340 100644
--- a/src/lib/test-array.c
+++ b/src/lib/test-array.c
@@ -191,7 +191,7 @@ static void test_array_cmp(void)
 	t_array_init(&arr1, NELEMS);
 	t_array_init(&arr2, NELEMS);
 	for (i = 0; i < NELEMS; i++) {
-		elems[i] = i_rand();
+		elems[i] = i_rand_ushort();
 		array_push_back(&arr2, &elems[i]);
 	}
 	array_append(&arr1, elems, NELEMS);
diff --git a/src/lib/test-base32.c b/src/lib/test-base32.c
index 054ffb20b6..072dae8fc4 100644
--- a/src/lib/test-base32.c
+++ b/src/lib/test-base32.c
@@ -153,7 +153,7 @@ static void test_base32_random(void)
 	for (i = 0; i < 1000; i++) {
 		max = i_rand_limit(sizeof(buf));
 		for (j = 0; j < max; j++)
-			buf[j] = i_rand();
+			buf[j] = i_rand_uchar();
 
 		str_truncate(str, 0);
 		str_truncate(dest, 0);
@@ -168,7 +168,7 @@ static void test_base32_random(void)
 	for (i = 0; i < 1000; i++) {
 		max = i_rand_limit(sizeof(buf));
 		for (j = 0; j < max; j++)
-			buf[j] = i_rand();
+			buf[j] = i_rand_uchar();
 
 		str_truncate(str, 0);
 		str_truncate(dest, 0);
diff --git a/src/lib/test-base64.c b/src/lib/test-base64.c
index 3ad3f04e93..e745ba3c92 100644
--- a/src/lib/test-base64.c
+++ b/src/lib/test-base64.c
@@ -113,7 +113,7 @@ static void test_base64_random(void)
 	for (i = 0; i < 1000; i++) {
 		max = i_rand_limit(sizeof(buf));
 		for (j = 0; j < max; j++)
-			buf[j] = i_rand();
+			buf[j] = i_rand_uchar();
 
 		str_truncate(str, 0);
 		str_truncate(dest, 0);
@@ -237,7 +237,7 @@ static void test_base64url_random(void)
 	for (i = 0; i < 1000; i++) {
 		max = i_rand_limit(sizeof(buf));
 		for (j = 0; j < max; j++)
-			buf[j] = i_rand();
+			buf[j] = i_rand_uchar();
 
 		str_truncate(str, 0);
 		str_truncate(dest, 0);
@@ -1091,7 +1091,7 @@ test_base64_random_lowlevel_case(const struct base64_scheme *b64,
 	for (i = 0; i < 1000; i++) {
 		in_buf_size = i_rand_limit(sizeof(in_buf));
 		for (j = 0; j < in_buf_size; j++)
-			in_buf[j] = i_rand();
+			in_buf[j] = i_rand_uchar();
 
 		test_base64_random_lowlevel_one_block(b64, enc_flags, dec_flags,
 						      max_line_len, i,
@@ -1112,7 +1112,7 @@ test_base64_random_lowlevel_case(const struct base64_scheme *b64,
 	for (i = 0; i < 1000; i++) {
 		in_buf_size = i_rand_limit(sizeof(in_buf));
 		for (j = 0; j < in_buf_size; j++)
-			in_buf[j] = i_rand();
+			in_buf[j] = i_rand_uchar();
 
 		test_base64_random_lowlevel_stream(b64, enc_flags, dec_flags,
 						   max_line_len, i,
@@ -1133,7 +1133,7 @@ test_base64_random_lowlevel_case(const struct base64_scheme *b64,
 	for (i = 0; i < 1000; i++) {
 		in_buf_size = i_rand_limit(sizeof(in_buf));
 		for (j = 0; j < in_buf_size; j++)
-			in_buf[j] = i_rand();
+			in_buf[j] = i_rand_uchar();
 
 		test_base64_random_lowlevel_stream(b64, enc_flags, dec_flags,
 						   max_line_len, i,
diff --git a/src/lib/test-buffer.c b/src/lib/test-buffer.c
index baa4043124..2d188654a3 100644
--- a/src/lib/test-buffer.c
+++ b/src/lib/test-buffer.c
@@ -16,7 +16,7 @@ static void test_buffer_random(void)
 
 	buf = buffer_create_dynamic(default_pool, 1);
 	for (i = 0; i < BUF_TEST_SIZE; i++)
-		testdata[i] = i_rand();
+		testdata[i] = i_rand_uchar();
 	memset(shadowbuf, 0, sizeof(shadowbuf));
 
 	shadowbuf_size = 0;
diff --git a/src/lib/test-istream-base64-decoder.c b/src/lib/test-istream-base64-decoder.c
index 188e3e581e..ea45f6d6d9 100644
--- a/src/lib/test-istream-base64-decoder.c
+++ b/src/lib/test-istream-base64-decoder.c
@@ -153,7 +153,7 @@ test_istream_base64_io_random(void)
 		/* Initialize test data */
 		in_buf_size = i_rand_limit(sizeof(in_buf));
 		for (j = 0; j < in_buf_size; j++)
-			in_buf[j] = i_rand();
+			in_buf[j] = i_rand_uchar();
 
 		/* Reset final output buffer */
 		buffer_set_used_size(out_buf, 0);