Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-11-04 14:42:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into websockets

Browse Source
This commit is contained in:
Aaron Kimbre
2025-01-21 14:07:02 -06:00
parent 1b6c258901 306d959a83
commit eeb7b68a3b
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dMasterServer/MasterServer.cpp
View File

@@ -246,7 +246,8 @@ int main(int argc, char** argv) {
// Regenerate hash based on new password // Regenerate hash based on new password
char salt[BCRYPT_HASHSIZE]; char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE]; char hash[BCRYPT_HASHSIZE];
assert(GenerateBCryptPassword(password, 12, salt, hash) == 0); int res = GenerateBCryptPassword(password, 12, salt, hash);
assert(res == 0);
Database::Get()->UpdateAccountPassword(accountId->id, std::string(hash, BCRYPT_HASHSIZE)); Database::Get()->UpdateAccountPassword(accountId->id, std::string(hash, BCRYPT_HASHSIZE));
@@ -284,7 +285,8 @@ int main(int argc, char** argv) {
//Generate new hash for bcrypt //Generate new hash for bcrypt
char salt[BCRYPT_HASHSIZE]; char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE]; char hash[BCRYPT_HASHSIZE];
assert(GenerateBCryptPassword(password, 12, salt, hash) == 0); int res = GenerateBCryptPassword(password, 12, salt, hash);
assert(res == 0);
//Create account //Create account
try { try {
@@ -323,7 +325,8 @@ int main(int argc, char** argv) {
char salt[BCRYPT_HASHSIZE]; char salt[BCRYPT_HASHSIZE];
char hash[BCRYPT_HASHSIZE]; char hash[BCRYPT_HASHSIZE];
const auto& cfgPassword = Game::config->GetValue("master_password"); const auto& cfgPassword = Game::config->GetValue("master_password");
GenerateBCryptPassword(!cfgPassword.empty() ? cfgPassword : "3.25DARKFLAME1", 13, salt, hash); int res = GenerateBCryptPassword(!cfgPassword.empty() ? cfgPassword : "3.25DARKFLAME1", 13, salt, hash);
assert(res == 0);
Game::server = new dServer(ourIP, ourPort, 0, maxClients, true, false, Game::logger, "", 0, ServerType::Master, Game::config, &Game::lastSignal, hash); Game::server = new dServer(ourIP, ourPort, 0, maxClients, true, false, Game::logger, "", 0, ServerType::Master, Game::config, &Game::lastSignal, hash);