moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation with Qt 5.9

Browse Source
This commit is contained in:
Cameron Gutman
2018-07-21 18:47:41 -07:00
parent 71c11cacd9
commit 519626a6d5
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/backend/identitymanager.cpp
+4 -3
View File
@@ -2,12 +2,12 @@
#include "utils.h" #include "utils.h"
#include <QDebug> #include <QDebug>
#include <QRandomGenerator64>
#include <openssl/pem.h> #include <openssl/pem.h>
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/bn.h> #include <openssl/bn.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/rand.h>
#define SER_UNIQUEID "uniqueid" #define SER_UNIQUEID "uniqueid"
#define SER_CERT "certificate" #define SER_CERT "certificate"
@@ -195,8 +195,9 @@ IdentityManager::getUniqueId()
} }
else { else {
// Generate a new unique ID in base 16 // Generate a new unique ID in base 16
m_CachedUniqueId = QString::number( uint64_t uid;
QRandomGenerator64::securelySeeded().generate64(), 16); RAND_bytes(reinterpret_cast<unsigned char*>(&uid), sizeof(uid));
m_CachedUniqueId = QString::number(uid, 16);
qDebug() << "Generated new unique ID: " << m_CachedUniqueId; qDebug() << "Generated new unique ID: " << m_CachedUniqueId;
app/backend/nvpairingmanager.cpp
-2
View File
@@ -1,8 +1,6 @@
#include "nvpairingmanager.h" #include "nvpairingmanager.h"
#include "utils.h" #include "utils.h"
#include <QRandomGenerator>
#include <openssl/bio.h> #include <openssl/bio.h>
#include <openssl/aes.h> #include <openssl/aes.h>
#include <openssl/rand.h> #include <openssl/rand.h>
app/streaming/session.cpp
+8 -6
View File
@@ -9,7 +9,8 @@
#include "video/ffmpeg.h" #include "video/ffmpeg.h"
#endif #endif
#include <QRandomGenerator> #include <openssl/rand.h>
#include <QtEndian> #include <QtEndian>
#include <QCoreApplication> #include <QCoreApplication>
#include <QThreadPool> #include <QThreadPool>
@@ -206,11 +207,12 @@ Session::Session(NvComputer* computer, NvApp& app)
m_StreamConfig.fps = m_Preferences.fps; m_StreamConfig.fps = m_Preferences.fps;
m_StreamConfig.bitrate = m_Preferences.bitrateKbps; m_StreamConfig.bitrate = m_Preferences.bitrateKbps;
m_StreamConfig.hevcBitratePercentageMultiplier = 75; m_StreamConfig.hevcBitratePercentageMultiplier = 75;
for (unsigned int i = 0; i < sizeof(m_StreamConfig.remoteInputAesKey); i++) { RAND_bytes(reinterpret_cast<unsigned char*>(m_StreamConfig.remoteInputAesKey),
m_StreamConfig.remoteInputAesKey[i] = sizeof(m_StreamConfig.remoteInputAesKey));
(char)(QRandomGenerator::global()->generate() % 256);
} // Only the first 4 bytes are populated in the RI key IV
*(int*)m_StreamConfig.remoteInputAesIv = qToBigEndian(QRandomGenerator::global()->generate()); RAND_bytes(reinterpret_cast<unsigned char*>(m_StreamConfig.remoteInputAesIv), 4);
switch (m_Preferences.audioConfig) switch (m_Preferences.audioConfig)
{ {
case StreamingPreferences::AC_AUTO: case StreamingPreferences::AC_AUTO: