diff options
Diffstat (limited to 'src/util/auth.cpp')
| -rw-r--r-- | src/util/auth.cpp | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/src/util/auth.cpp b/src/util/auth.cpp index 3dd5a9afa..8a208b2c2 100644 --- a/src/util/auth.cpp +++ b/src/util/auth.cpp @@ -31,8 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // their password. (Exception : if the password field is // blank, we send a blank password - this is for backwards // compatibility with password-less players). -std::string translate_password(const std::string &name, - const std::string &password) +std::string translate_password(const std::string &name, const std::string &password) { if (password.length() == 0) return ""; @@ -50,21 +49,20 @@ std::string translate_password(const std::string &name, // given pointers. Contains the preparations, call parameters // and error checking common to all srp verifier generation code. // See docs of srp_create_salted_verification_key for more info. -static inline void gen_srp_v(const std::string &name, - const std::string &password, char **salt, size_t *salt_len, - char **bytes_v, size_t *len_v) +static inline void gen_srp_v(const std::string &name, const std::string &password, + char **salt, size_t *salt_len, char **bytes_v, size_t *len_v) { std::string n_name = lowercase(name); SRP_Result res = srp_create_salted_verification_key(SRP_SHA256, SRP_NG_2048, - n_name.c_str(), (const unsigned char *)password.c_str(), - password.size(), (unsigned char **)salt, salt_len, - (unsigned char **)bytes_v, len_v, NULL, NULL); + n_name.c_str(), (const unsigned char *)password.c_str(), + password.size(), (unsigned char **)salt, salt_len, + (unsigned char **)bytes_v, len_v, NULL, NULL); FATAL_ERROR_IF(res != SRP_OK, "Couldn't create salted SRP verifier"); } /// Creates a verification key with given salt and password. -std::string generate_srp_verifier(const std::string &name, - const std::string &password, const std::string &salt) +std::string generate_srp_verifier(const std::string &name, const std::string &password, + const std::string &salt) { size_t salt_len = salt.size(); // The API promises us that the salt doesn't @@ -80,9 +78,8 @@ std::string generate_srp_verifier(const std::string &name, } /// Creates a verification key and salt with given password. -void generate_srp_verifier_and_salt(const std::string &name, - const std::string &password, std::string *verifier, - std::string *salt) +void generate_srp_verifier_and_salt(const std::string &name, const std::string &password, + std::string *verifier, std::string *salt) { char *bytes_v = nullptr; size_t verifier_len; @@ -97,8 +94,7 @@ void generate_srp_verifier_and_salt(const std::string &name, /// Gets an SRP verifier, generating a salt, /// and encodes it as DB-ready string. -std::string get_encoded_srp_verifier(const std::string &name, - const std::string &password) +std::string get_encoded_srp_verifier(const std::string &name, const std::string &password) { std::string verifier; std::string salt; @@ -107,31 +103,28 @@ std::string get_encoded_srp_verifier(const std::string &name, } /// Converts the passed SRP verifier into a DB-ready format. -std::string encode_srp_verifier(const std::string &verifier, - const std::string &salt) +std::string encode_srp_verifier(const std::string &verifier, const std::string &salt) { std::ostringstream ret_str; - ret_str << "#1#" - << base64_encode((unsigned char *)salt.c_str(), salt.size()) << "#" + ret_str << "#1#" << base64_encode((unsigned char *)salt.c_str(), salt.size()) + << "#" << base64_encode((unsigned char *)verifier.c_str(), verifier.size()); return ret_str.str(); } /// Reads the DB-formatted SRP verifier and gets the verifier /// and salt components. -bool decode_srp_verifier_and_salt(const std::string &encoded, - std::string *verifier, std::string *salt) +bool decode_srp_verifier_and_salt( + const std::string &encoded, std::string *verifier, std::string *salt) { std::vector<std::string> components = str_split(encoded, '#'); - if ((components.size() != 4) - || (components[1] != "1") // 1 means srp - || !base64_is_valid(components[2]) - || !base64_is_valid(components[3])) + if ((components.size() != 4) || (components[1] != "1") // 1 means srp + || !base64_is_valid(components[2]) || + !base64_is_valid(components[3])) return false; *salt = base64_decode(components[2]); *verifier = base64_decode(components[3]); return true; - } |