Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

config: use RNG compatible with QT < 5.10

Browse Source
This commit is contained in:
Stéphane Lepin 2018-11-08 08:58:26 +01:00
parent edc64b8336
commit 689ce16f1b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Config.cpp
View File

@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include <util/config-file.h> #include <util/config-file.h>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QRandomGenerator> #include <QTime>
#define SECTION_NAME "WebsocketAPI" #define SECTION_NAME "WebsocketAPI"
#define PARAM_ENABLE "ServerEnabled" #define PARAM_ENABLE "ServerEnabled"
@ -48,6 +48,8 @@ Config::Config() :
Salt(""), Salt(""),
SettingsLoaded(false) SettingsLoaded(false)
{ {
qsrand(QTime::currentTime().msec());
// OBS Config defaults // OBS Config defaults
config_t* obsConfig = obs_frontend_get_global_config(); config_t* obsConfig = obs_frontend_get_global_config();
if (obsConfig) { if (obsConfig) {
@ -112,11 +114,12 @@ void Config::Save()
QString Config::GenerateSalt() QString Config::GenerateSalt()
{ {
auto random = QRandomGenerator::global();
// Generate 32 random chars // Generate 32 random chars
QByteArray randomChars(32, '\0'); const size_t randomCount = 32;
random->fillRange((quint32*)randomChars.data(), randomChars.size() / 4); QByteArray randomChars;
for (size_t i = 0; i < randomCount; i++) {
randomChars.append((char)qrand());
}
// Convert the 32 random chars to a base64 string // Convert the 32 random chars to a base64 string
QString salt = randomChars.toBase64(); QString salt = randomChars.toBase64();