From a330175614a22c622261e6a70b23c92b2a841bd4 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 25 Feb 2017 17:57:22 +0100
Subject: util.crand: Throw error if OpenSSLs RNG is not seeded

---
 util-src/crand.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'util-src/crand.c')

diff --git a/util-src/crand.c b/util-src/crand.c
index cc2047eb..e7caf683 100644
--- a/util-src/crand.c
+++ b/util-src/crand.c
@@ -67,6 +67,11 @@ int Lrandom(lua_State *L) {
 	arc4random_buf(buf, len);
 	ret = len;
 #elif defined(WITH_OPENSSL)
+	if(!RAND_status()) {
+		lua_pushliteral(L, "OpenSSL PRNG not seeded");
+		lua_error(L);
+	}
+
 	ret = RAND_bytes(buf, len);
 
 	if(ret == 1) {
@@ -87,6 +92,7 @@ int luaopen_util_crand(lua_State *L) {
 #if (LUA_VERSION_NUM > 501)
 	luaL_checkversion(L);
 #endif
+
 	lua_newtable(L);
 	lua_pushcfunction(L, Lrandom);
 	lua_setfield(L, -2, "bytes");
@@ -100,10 +106,6 @@ int luaopen_util_crand(lua_State *L) {
 #endif
 	lua_setfield(L, -2, "_source");
 
-#if defined(WITH_OPENSSL) && defined(_WIN32)
-	/* TODO Do we need to seed this on Windows? */
-#endif
-
 	return 1;
 }
 
-- 
cgit v1.2.3