From 5bb5226edc7243fb4b4c3db81a80e8d60dba4574 Mon Sep 17 00:00:00 2001
From: Aaron Jones <aaronmdjones@gmail.com>
Date: Thu, 15 Sep 2016 19:51:36 +0000
Subject: [PATCH] OpenSSL: Simplify the RNG code

---
 libratbox/src/openssl.c | 41 ++++++++++++++---------------------------
 1 file changed, 14 insertions(+), 27 deletions(-)

diff --git a/libratbox/src/openssl.c b/libratbox/src/openssl.c
index ccb14f4e..90f017d3 100644
--- a/libratbox/src/openssl.c
+++ b/libratbox/src/openssl.c
@@ -429,45 +429,32 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
 int
 rb_init_prng(const char *const path, prng_seed_t seed_type)
 {
-	if(seed_type == RB_PRNG_DEFAULT)
-	{
-#ifdef _WIN32
-		RAND_screen();
-#endif
-		return RAND_status();
-	}
-	if(path == NULL)
-		return RAND_status();
+	(void) rb_ssl_last_err();
 
-	switch(seed_type)
+	if(seed_type == RB_PRNG_FILE && RAND_load_file(path, -1) < 0)
+		rb_lib_log("%s: RAND_load_file: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
+
+	if(RAND_status() != 1)
 	{
-	case RB_PRNG_FILE:
-		if(RAND_load_file(path, -1) == -1)
-			return -1;
-		break;
-#ifdef _WIN32
-	case RB_PRNGWIN32:
-		RAND_screen();
-		break;
-#endif
-	default:
-		return -1;
+		rb_lib_log("%s: RAND_status: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
+		return 0;
 	}
 
-	return RAND_status();
+	return 1;
 }
 
 int
 rb_get_random(void *const buf, const size_t length)
 {
-	int ret;
+	(void) rb_ssl_last_err();
 
-	if((ret = RAND_bytes(buf, length)) == 0)
+	if(RAND_bytes(buf, (int) length) != 1)
 	{
-		/* remove the error from the queue */
-		rb_ssl_last_err();
+		rb_lib_log("%s: RAND_bytes: %s", __func__, rb_ssl_strerror(rb_ssl_last_err()));
+		return 0;
 	}
-	return ret;
+
+	return 1;
 }
 
 const char *