Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-11 13:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r11816) -Fix: forgot clearing one byte, causing the passwords to differ slightly on different platforms.

Browse Source
This commit is contained in:
rubidium 2008-01-12 08:34:16 +00:00
parent 81b3635c80
commit 07e0e0a1ff
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/network/network_client.cpp
View File

@ -53,17 +53,18 @@ static const char *GenerateCompanyPasswordHash(const char *password)
memset(salted_password, 0, sizeof(salted_password)); memset(salted_password, 0, sizeof(salted_password));
snprintf(salted_password, sizeof(salted_password), "%s", password); snprintf(salted_password, sizeof(salted_password), "%s", password);
/* Add the game seed and the server's unique ID as the salt. */ /* Add the game seed and the server's unique ID as the salt. */
for (uint i = 0; i < NETWORK_UNIQUE_ID_LENGTH; i++) salted_password[i] ^= _password_server_unique_id[i] ^ (_password_game_seed >> i); for (uint i = 0; i < NETWORK_UNIQUE_ID_LENGTH - 1; i++) salted_password[i] ^= _password_server_unique_id[i] ^ (_password_game_seed >> i);
Md5 checksum; Md5 checksum;
uint8 digest[16]; uint8 digest[16];
static char hashed_password[NETWORK_UNIQUE_ID_LENGTH]; static char hashed_password[NETWORK_UNIQUE_ID_LENGTH];
/* Generate the MD5 hash */ /* Generate the MD5 hash */
checksum.Append((const uint8*)salted_password, sizeof(salted_password)); checksum.Append((const uint8*)salted_password, sizeof(salted_password) - 1);
checksum.Finish(digest); checksum.Finish(digest);
for (int di = 0; di < 16; di++) sprintf(hashed_password + di * 2, "%02x", digest[di]); for (int di = 0; di < 16; di++) sprintf(hashed_password + di * 2, "%02x", digest[di]);
hashed_password[lengthof(hashed_password) - 1] = '\0';
return hashed_password; return hashed_password;
} }