From 519626a6d59b2b0765088583cca2cbb4ef3b1e7a Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sat, 21 Jul 2018 18:47:41 -0700
Subject: [PATCH] Fix compilation with Qt 5.9

---
 app/backend/identitymanager.cpp  |  7 ++++---
 app/backend/nvpairingmanager.cpp |  2 --
 app/streaming/session.cpp        | 14 ++++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/backend/identitymanager.cpp b/app/backend/identitymanager.cpp
index 64849d6a..936ea3cf 100644
--- a/app/backend/identitymanager.cpp
+++ b/app/backend/identitymanager.cpp
@@ -2,12 +2,12 @@
 #include "utils.h"
 
 #include <QDebug>
-#include <QRandomGenerator64>
 
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/bn.h>
 #include <openssl/x509.h>
+#include <openssl/rand.h>
 
 #define SER_UNIQUEID "uniqueid"
 #define SER_CERT "certificate"
@@ -195,8 +195,9 @@ IdentityManager::getUniqueId()
         }
         else {
             // Generate a new unique ID in base 16
-            m_CachedUniqueId = QString::number(
-                        QRandomGenerator64::securelySeeded().generate64(), 16);
+            uint64_t uid;
+            RAND_bytes(reinterpret_cast<unsigned char*>(&uid), sizeof(uid));
+            m_CachedUniqueId = QString::number(uid, 16);
 
             qDebug() << "Generated new unique ID: " << m_CachedUniqueId;
 
diff --git a/app/backend/nvpairingmanager.cpp b/app/backend/nvpairingmanager.cpp
index 44d9e23e..9d089ef1 100644
--- a/app/backend/nvpairingmanager.cpp
+++ b/app/backend/nvpairingmanager.cpp
@@ -1,8 +1,6 @@
 #include "nvpairingmanager.h"
 #include "utils.h"
 
-#include <QRandomGenerator>
-
 #include <openssl/bio.h>
 #include <openssl/aes.h>
 #include <openssl/rand.h>
diff --git a/app/streaming/session.cpp b/app/streaming/session.cpp
index 9115fc95..eb2ad656 100644
--- a/app/streaming/session.cpp
+++ b/app/streaming/session.cpp
@@ -9,7 +9,8 @@
 #include "video/ffmpeg.h"
 #endif
 
-#include <QRandomGenerator>
+#include <openssl/rand.h>
+
 #include <QtEndian>
 #include <QCoreApplication>
 #include <QThreadPool>
@@ -206,11 +207,12 @@ Session::Session(NvComputer* computer, NvApp& app)
     m_StreamConfig.fps = m_Preferences.fps;
     m_StreamConfig.bitrate = m_Preferences.bitrateKbps;
     m_StreamConfig.hevcBitratePercentageMultiplier = 75;
-    for (unsigned int i = 0; i < sizeof(m_StreamConfig.remoteInputAesKey); i++) {
-        m_StreamConfig.remoteInputAesKey[i] =
-                (char)(QRandomGenerator::global()->generate() % 256);
-    }
-    *(int*)m_StreamConfig.remoteInputAesIv = qToBigEndian(QRandomGenerator::global()->generate());
+    RAND_bytes(reinterpret_cast<unsigned char*>(m_StreamConfig.remoteInputAesKey),
+               sizeof(m_StreamConfig.remoteInputAesKey));
+
+    // Only the first 4 bytes are populated in the RI key IV
+    RAND_bytes(reinterpret_cast<unsigned char*>(m_StreamConfig.remoteInputAesIv), 4);
+
     switch (m_Preferences.audioConfig)
     {
     case StreamingPreferences::AC_AUTO: