From 723a2f99804aac24705feb022aba7132c4acb38f Mon Sep 17 00:00:00 2001
From: "James C. Owens" <jamesowens@optonline.net>
Date: Thu, 15 Jul 2021 19:09:18 -0400
Subject: [PATCH] Remove deprecated random number generator functions

This commit changes CInit to check for proper RNG seeding and use
RAND_poll() if necessary.

It removes RandAddSeed() RandAddSeedPerfmon() and also the use
of RAND_screen.
---
 src/qt/winshutdownmonitor.cpp | 10 ---------
 src/util.cpp                  | 38 ++++++++++++++++++++++++++++-------
 2 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/qt/winshutdownmonitor.cpp b/src/qt/winshutdownmonitor.cpp
index 49517cee12..20b2d3c597 100755
--- a/src/qt/winshutdownmonitor.cpp
+++ b/src/qt/winshutdownmonitor.cpp
@@ -22,16 +22,6 @@ bool WinShutdownMonitor::nativeEventFilter(const QByteArray &eventType, void *pM
 
        MSG *pMsg = static_cast<MSG *>(pMessage);
 
-       // Seed OpenSSL PRNG with Windows event data (e.g.  mouse movements and other user interactions)
-       if (RAND_event(pMsg->message, pMsg->wParam, pMsg->lParam) == 0) {
-           // Warn only once as this is performance-critical
-           static bool warned = false;
-           if (!warned) {
-               LogPrintf("%s: OpenSSL RAND_event() failed to seed OpenSSL PRNG with enough data.\n", __func__);
-               warned = true;
-           }
-       }
-
        switch(pMsg->message)
        {
            case WM_QUERYENDSESSION:
diff --git a/src/util.cpp b/src/util.cpp
index 18dbb7e231..ba9e302e6b 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -85,14 +85,36 @@ class CInit
             ppmutexOpenSSL[i] = new CCriticalSection();
         CRYPTO_set_locking_callback(locking_callback);
 
-#ifdef WIN32
-        // Seed OpenSSL PRNG with current contents of the screen
-        RAND_screen();
-#endif
+        // Check whether OpenSSL random number generator is properly seeded. If not, attempt to seed using RAND_poll().
+        // Note that in versions of OpenSSL in the depends in Gridcoin (currently 1.1.1+), and modern Unix distros (using
+        // openSSL 1.1+ or modern Windows operating systems with the equivalent of /dev/urandom, the random number
+        // generator is automatically seeded on init, and periodically reseeded from trusted OS random sources. It is
+        // not necessary to manually reseed the RNG. Here we implement a check via RAND_status() to ensure the RNG
+        // is properly seeded. If not, we try 10 times (probably excessive) to seed the RNG via openSSL's entropy sources,
+        // breaking as soon as the return from RAND_poll() becomes 1 (successfully seeded). A 100 ms sleep is inserted
+        // between each try to ensure we give time for a short term unavailability of the OS entropy source to recover.
+        // If this falls through, we abort the application as we cannot have a non-functioning RNG.
+        bool seed_successful = RAND_status();
+        if (!seed_successful) {
+            for (unsigned int i = 0; i < 10; ++i)
+            {
+                seed_successful = RAND_poll();
+
+                if (seed_successful) break;
+
+                MilliSleep(100);
+            }
 
-        // Seed OpenSSL PRNG with performance counter
-        RandAddSeed();
+            if (!seed_successful) {
+                tfm::format(std::cerr, "ERROR: %s: Unable to initialize the random number generator. Cannot continue. "
+                                       "Please check your operating system to ensure the random number source is "
+                                       "available. (This is /dev/urandom on Linux.)",
+                            __func__);
+                std::abort();
+            }
+        }
     }
+
     ~CInit()
     {
         // Securely erase the memory used by the PRNG
@@ -118,13 +140,15 @@ void RandAddSeedPerfmon()
 {
     RandAddSeed();
 
+    // Only need for OpenSSL < 1.1 and Win32, since 1.1 and greater seed properly from Windows, and on Linux seeds properly
+    // in all cases.
+#if OPENSSL_VERSION_NUMBER < 0x10100000L && defined(WIN32)
     // This can take up to 2 seconds, so only do it every 10 minutes
     static int64_t nLastPerfmon;
     if ( GetAdjustedTime() < nLastPerfmon + 10 * 60)
         return;
     nLastPerfmon =  GetAdjustedTime();
 
-#ifdef WIN32
     // Don't need this on Linux, OpenSSL automatically uses /dev/urandom
     // Seed with the entire set of perfmon data
     unsigned char pdata[250000];