Merge remote-tracking branch 'origin/topic/timw/fix-RANDMAX-check'

* origin/topic/timw/fix-RANDMAX-check: Remove unused util::detail::rand64bit method
zeek · Jul 1, 2022 · ba96843 · ba96843
2 parents d3b6f9f + ef659b8
commit ba96843
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 15 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+5.1.0-dev.154 | 2022-07-01 14:10:58 -0700
+
+  * Remove unused util::detail::rand64bit method (Tim Wojtulewicz, Corelight)
+
 5.1.0-dev.151 | 2022-07-01 11:11:29 -0700
 
   * Management framework: bump zeek-client and cluster testsuite (Christian Kreibich, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.1.0-dev.151
+5.1.0-dev.154
diff --git a/src/util.cc b/src/util.cc
@@ -538,18 +538,6 @@ long int random_number()
 	return zeek_rand_state;
 	}
 
-// Returns a 64-bit random string.
-uint64_t rand64bit()
-	{
-	uint64_t base = 0;
-	int i;
-
-	static_assert(RAND_MAX == 2147483647); // 2^32-1
-	for ( i = 1; i <= 2; ++i )
-		base = (base << 32) | detail::random_number();
-	return base;
-	}
-
 TEST_CASE("util is_package_loader")
 	{
 	CHECK(is_package_loader("/some/path/__load__.zeek") == true);

diff --git a/src/util.h b/src/util.h
@@ -126,8 +126,6 @@ unsigned int initial_seed();
 // Returns true if the user explicitly set a seed via init_random_seed();
 extern bool have_random_seed();
 
-extern uint64_t rand64bit();
-
 /**
  * A platform-independent PRNG implementation.  Note that this is not
  * necessarily a "statistically sound" implementation as the main purpose is