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

Use newer crypto because it doesn't break

Browse Source
This commit is contained in:
tt2468 2022-08-04 23:38:36 -07:00
parent 78837a4a2b
commit 22b2640e1a
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Config.cpp
View File

@ -20,6 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
#include <QObject> #include <QObject>
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QRandomGenerator>
#include <QTime> #include <QTime>
#include <QSystemTrayIcon> #include <QSystemTrayIcon>
#include <QMainWindow> #include <QMainWindow>
@ -56,8 +57,6 @@ Config::Config() :
Salt(""), Salt(""),
SettingsLoaded(false) SettingsLoaded(false)
{ {
qsrand(QTime::currentTime().msec());
SetDefaults(); SetDefaults();
SessionChallenge = GenerateSalt(); SessionChallenge = GenerateSalt();
@ -202,36 +201,30 @@ void Config::MigrateFromGlobalSettings()
QString Config::GenerateSalt() QString Config::GenerateSalt()
{ {
// Get OS seeded random number generator
QRandomGenerator *rng = QRandomGenerator::global();
// Generate 32 random chars // Generate 32 random chars
const size_t randomCount = 32; const size_t randomCount = 32;
QByteArray randomChars; QByteArray randomChars;
for (size_t i = 0; i < randomCount; i++) { for (size_t i = 0; i < randomCount; i++)
randomChars.append((char)qrand()); randomChars.append((char)rng->bounded(255));
}
// Convert the 32 random chars to a base64 string // Convert the 32 random chars to a base64 string
QString salt = randomChars.toBase64(); return randomChars.toBase64();
return salt;
} }
QString Config::GenerateSecret(QString password, QString salt) QString Config::GenerateSecret(QString password, QString salt)
{ {
// Concatenate the password and the salt // Create challenge hash
QString passAndSalt = ""; auto challengeHash = QCryptographicHash(QCryptographicHash::Algorithm::Sha256);
passAndSalt += password; // Add password bytes to hash
passAndSalt += salt; challengeHash.addData(password.toUtf8());
// Add salt bytes to hash
challengeHash.addData(salt.toUtf8());
// Generate a SHA256 hash of the password and salt // Generate SHA256 hash then encode to Base64
auto challengeHash = QCryptographicHash::hash( return challengeHash.result().toBase64();
passAndSalt.toUtf8(),
QCryptographicHash::Algorithm::Sha256
);
// Encode SHA256 hash to Base64
QString challenge = challengeHash.toBase64();
return challenge;
} }
void Config::SetPassword(QString password) void Config::SetPassword(QString password)