dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Saveload: Remove use of randombytes in company passwords storage

Browse Source 
Use RandomBytesWithFallback
Replace related key/data arrays with std::array
This commit is contained in:
Jonathan G Rennison
2024-02-06 19:17:57 +00:00
parent 9492aa1c0d
commit f966153ae2
4 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/network.cpp
View File

@@ -71,8 +71,8 @@ bool _is_network_server; ///< Does this client wa
bool _network_settings_access; ///< Can this client change server settings?
NetworkCompanyState *_network_company_states = nullptr; ///< Statistics about some companies.
std::string _network_company_server_id; ///< Server ID string used for company passwords
uint8_t _network_company_password_storage_token[16]; ///< Non-secret token for storage of company passwords in savegames
uint8_t _network_company_password_storage_key[32]; ///< Key for storage of company passwords in savegames
std::array<uint8_t, 16> _network_company_password_storage_token; ///< Non-secret token for storage of company passwords in savegames
std::array<uint8_t, 32> _network_company_password_storage_key; ///< Key for storage of company passwords in savegames
ClientID _network_own_client_id; ///< Our client identifier.
ClientID _redirect_console_to_client; ///< If not invalid, redirect the console output to a client.
uint8_t _network_reconnect; ///< Reconnect timeout

4
src/network/network_func.h
View File

@@ -26,8 +26,8 @@
extern NetworkCompanyState *_network_company_states;
extern std::string _network_company_server_id;
extern uint8_t _network_company_password_storage_token[16];
extern uint8_t _network_company_password_storage_key[32];
extern std::array<uint8_t, 16> _network_company_password_storage_token;
extern std::array<uint8_t, 32> _network_company_password_storage_key;
extern ClientID _network_own_client_id;
extern ClientID _redirect_console_to_client;