Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(455)

Unified Diff: remoting/host/pin_hash.cc

Issue 1755273003: Simplify AuthenticationMethod type and PIN hash handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/host/pin_hash.cc
diff --git a/remoting/host/pin_hash.cc b/remoting/host/pin_hash.cc
index c9b1ca3cb6575acc0b48fd1510c9bba5cd82c804..d0ee42d6e96c4999983ca4dcfb77396eeef6a828 100644
--- a/remoting/host/pin_hash.cc
+++ b/remoting/host/pin_hash.cc
@@ -11,10 +11,33 @@
namespace remoting {
+bool ParsePinHashFromConfig(const std::string& value,
+ const std::string& host_id,
+ std::string* pin_hash_out) {
+ size_t separator = value.find(':');
+ if (separator == std::string::npos)
+ return false;
+
+ if (!base::Base64Decode(value.substr(separator + 1), pin_hash_out))
+ return false;
+
+ std::string function_name = value.substr(0, separator);
+ if (function_name == "plain") {
+ *pin_hash_out = protocol::ApplySharedSecretHashFunction(
+ protocol::HashFunction::HMAC_SHA256, host_id, *pin_hash_out);
+ return true;
+ } else if (function_name == "hmac") {
+ return true;
+ }
+
+ pin_hash_out->clear();
+ return false;
+}
+
std::string MakeHostPinHash(const std::string& host_id,
const std::string& pin) {
- std::string hash = protocol::AuthenticationMethod::ApplyHashFunction(
- protocol::AuthenticationMethod::HMAC_SHA256, host_id, pin);
+ std::string hash = protocol::ApplySharedSecretHashFunction(
+ protocol::HashFunction::HMAC_SHA256, host_id, pin);
std::string hash_base64;
base::Base64Encode(hash, &hash_base64);
return "hmac:" + hash_base64;
@@ -23,15 +46,14 @@ std::string MakeHostPinHash(const std::string& host_id,
bool VerifyHostPinHash(const std::string& hash,
const std::string& host_id,
const std::string& pin) {
- remoting::protocol::SharedSecretHash hash_parsed;
- if (!hash_parsed.Parse(hash)) {
- LOG(FATAL) << "Invalid hash.";
+ std::string hash_parsed;
+ if (!ParsePinHashFromConfig(hash, host_id, &hash_parsed)) {
+ LOG(FATAL) << "Failed to parse PIN hash.";
return false;
}
- std::string hash_calculated =
- remoting::protocol::AuthenticationMethod::ApplyHashFunction(
- hash_parsed.hash_function, host_id, pin);
- return hash_calculated == hash_parsed.value;
+ std::string hash_calculated = protocol::ApplySharedSecretHashFunction(
+ protocol::HashFunction::HMAC_SHA256, host_id, pin);
+ return hash_calculated == hash_parsed;
}
} // namespace remoting

Powered by Google App Engine
This is Rietveld 408576698