0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change a ternary to a single line

Browse source 
Without the comments, it's short enough to fit into a single line.
This commit is contained in:
Jyrki Vesterinen 2018-03-13 20:17:35 +02:00 • committed by Gregory A Lundberg
parent 67ff2257fd
commit 7dbe554f6c
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/server/server.cpp
View file

@ -791,9 +791,7 @@ void server::send_password_request(socket_ptr socket, const std::string& msg,
// If using crypt_blowfish, use 32 random Base64 characters, cryptographic-strength, 192 bits entropy
// else (phppass, MD5, $H$), use 8 random integer digits, not secure, do not use, this is crap, 29.8 bits entropy
std::string nonce {
/* if */ (salt[1] == '2')
/* then */ ? user_handler_->create_secure_nonce()
/* else */ : user_handler_->create_unsecure_nonce()
(salt[1] == '2') ? user_handler_->create_secure_nonce() : user_handler_->create_unsecure_nonce()
};
std::string password_challenge = salt + nonce;
if(user_handler_->use_phpbb_encryption() && salt.empty()) {