Merge remote-tracking branch 'origin/patches-2.0'

Conflicts:
	arc4random.c

1 files changed, 17 insertions, 0 deletions

diff --git a/evutil_rand.c b/evutil_rand.c
index 38814e4c..584d9495 100644
--- a/evutil_rand.c
+++ b/evutil_rand.c
@@ -44,6 +44,12 @@
 #include <stdlib.h>
 #include <string.h>
 int
+evutil_secure_rng_set_urandom_device_file(char *fname)
+{
+	(void) fname;
+	return -1;
+}
+int
 evutil_secure_rng_init(void)
 {
 	/* call arc4random() now to force it to self-initialize */
@@ -145,6 +151,17 @@ evutil_free_secure_rng_globals_locks(void)
 }
 
 int
+evutil_secure_rng_set_urandom_device_file(char *fname)
+{
+#ifdef TRY_SEED_URANDOM
+	_ARC4_LOCK();
+	arc4random_urandom_filename = fname;
+	_ARC4_UNLOCK();
+#endif
+	return 0;
+}
+
+int
 evutil_secure_rng_init(void)
 {
 	int val;