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

Utils/UI: Make GeneratePassword() use std::string

Browse Source 
Just for consistency
This commit is contained in:
tt2468 2021-09-17 02:03:47 -07:00
parent a5a19b9952
commit 69ccc99921
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.cpp
View File

@ -67,7 +67,7 @@ void Config::Load()
} else { } else {
AuthRequired = config_get_bool(obsConfig, CONFIG_SECTION_NAME, PARAM_AUTHREQUIRED); AuthRequired = config_get_bool(obsConfig, CONFIG_SECTION_NAME, PARAM_AUTHREQUIRED);
if (FirstLoad) { if (FirstLoad) {
ServerPassword = Utils::Crypto::GeneratePassword(); ServerPassword = QString::fromStdString(Utils::Crypto::GeneratePassword());
} else { } else {
ServerPassword = config_get_string(obsConfig, CONFIG_SECTION_NAME, PARAM_PASSWORD); ServerPassword = config_get_string(obsConfig, CONFIG_SECTION_NAME, PARAM_PASSWORD);
} }

2
src/forms/SettingsDialog.cpp
View File

@ -244,7 +244,7 @@ void SettingsDialog::EnableAuthenticationCheckBoxChanged()
void SettingsDialog::GeneratePasswordButtonClicked() void SettingsDialog::GeneratePasswordButtonClicked()
{ {
QString newPassword = Utils::Crypto::GeneratePassword(); QString newPassword = QString::fromStdString(Utils::Crypto::GeneratePassword());
ui->serverPasswordLineEdit->setText(newPassword); ui->serverPasswordLineEdit->setText(newPassword);
ui->serverPasswordLineEdit->selectAll(); ui->serverPasswordLineEdit->selectAll();
passwordManuallyEdited = false; passwordManuallyEdited = false;

4
src/utils/Crypto.cpp
View File

@ -59,13 +59,13 @@ bool Utils::Crypto::CheckAuthenticationString(std::string secret, std::string ch
return (authenticationString == expectedAuthenticationString); return (authenticationString == expectedAuthenticationString);
} }
QString Utils::Crypto::GeneratePassword(size_t length) std::string Utils::Crypto::GeneratePassword(size_t length)
{ {
// Get OS random number generator // Get OS random number generator
QRandomGenerator *rng = QRandomGenerator::system(); QRandomGenerator *rng = QRandomGenerator::system();
// Fill string with random alphanumeric // Fill string with random alphanumeric
QString ret; std::string ret;
for (size_t i = 0; i < length; i++) for (size_t i = 0; i < length; i++)
ret += allowedChars[rng->bounded(0, allowedCharsCount)]; ret += allowedChars[rng->bounded(0, allowedCharsCount)];

2
src/utils/Crypto.h
View File

@ -8,6 +8,6 @@ namespace Utils {
std::string GenerateSalt(); std::string GenerateSalt();
std::string GenerateSecret(std::string password, std::string salt); std::string GenerateSecret(std::string password, std::string salt);
bool CheckAuthenticationString(std::string secret, std::string challenge, std::string authenticationString); bool CheckAuthenticationString(std::string secret, std::string challenge, std::string authenticationString);
QString GeneratePassword(size_t length = 16); std::string GeneratePassword(size_t length = 16);
} }
} }