Add unit tests for easyUnlockPrivate API - crypto methods

chromeos/dbus/fake_easy_unlock_client.cc

Index: chromeos/dbus/fake_easy_unlock_client.cc
diff --git a/chromeos/dbus/fake_easy_unlock_client.cc b/chromeos/dbus/fake_easy_unlock_client.cc
index 748c0e64e5d9241110cb3c6f97acf9fe948b74c4..2e8b5f5697858b8ce5701cd06ba8e6f3da4ed07a 100644
--- a/chromeos/dbus/fake_easy_unlock_client.cc
+++ b/chromeos/dbus/fake_easy_unlock_client.cc
@@ -2,11 +2,55 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/json/json_string_value_serializer.h"
+#include "base/strings/stringprintf.h"
 #include "chromeos/dbus/fake_easy_unlock_client.h"
 
+namespace {
+
+// Keys generated using |GenerateEcP256KeyPair| are in the following format:
+// "{<key_type>: <key_pair_index>}".
+// <key_pair_index> is an integer identifying
+// the key pair.
+// <key_type> specifies whether the key is public or private. It can have one
+// of the following valies:
+const char kEc256PrivateKeyKey[] = "ec_p256_private_key";
+const char kEc256PublicKeyKey[] = "ec_p256_public_key";
+
+// Extracts key pair index from a key in format "<key_type>: <key_pair_index>}".
+int ExtractKeyPairIndexFromKey(const std::string& key,
+                               const std::string& key_type) {
+  JSONStringValueSerializer serializer(key);
+  scoped_ptr<base::Value> json_value(serializer.Deserialize(NULL, NULL));
+  if (!json_value)
+    return -1;
+
+  base::DictionaryValue* json_dictionary = NULL;
+  if (!json_value->GetAsDictionary(&json_dictionary))
+    return -1;
+
+  int key_pair_index = -1;
+  if (!json_dictionary->GetInteger(key_type, &key_pair_index))
+    return -1;
+  return key_pair_index;
+}
+
+}  // namespace
+
 namespace chromeos {
 
-FakeEasyUnlockClient::FakeEasyUnlockClient() {}
+// static
+bool FakeEasyUnlockClient::IsEcP256KeyPair(const std::string& private_key,
+                                           const std::string& public_key) {
+  int private_key_index =
+      ExtractKeyPairIndexFromKey(private_key, kEc256PrivateKeyKey);
+  int public_key_index =
+      ExtractKeyPairIndexFromKey(public_key, kEc256PublicKeyKey);
+
+  return private_key_index > 0  && public_key_index == private_key_index;
+}
+
+FakeEasyUnlockClient::FakeEasyUnlockClient() : generated_keys_count_(0) {}
 
 FakeEasyUnlockClient::~FakeEasyUnlockClient() {}
 
@@ -14,32 +58,90 @@ void FakeEasyUnlockClient::Init(dbus::Bus* bus) {}
 
 void FakeEasyUnlockClient::GenerateEcP256KeyPair(
     const KeyPairCallback& callback) {
+  ++generated_keys_count_;
+
+  callback.Run(
+      base::StringPrintf("{\"%s\": %d}",
+                         kEc256PrivateKeyKey,
+                         generated_keys_count_),
+      base::StringPrintf("{\"%s\": %d}",
+                         kEc256PublicKeyKey,
+                         generated_keys_count_));
 }
 
 void FakeEasyUnlockClient::PerformECDHKeyAgreement(
     const std::string& private_key,
     const std::string& public_key,
     const DataCallback& callback) {
+  int private_key_index =
+      ExtractKeyPairIndexFromKey(private_key, kEc256PrivateKeyKey);
+  int public_key_index =
+      ExtractKeyPairIndexFromKey(public_key, kEc256PublicKeyKey);
+  if (private_key_index < 0 || public_key_index < 0) {
+    callback.Run("");
+    return;
+  }
+
+  // The secret key should stay the same if key pairs to which private and
+  // public key belong to are changed. To achieve this, identify the key by
+  // sum and product of key pairs.
+  callback.Run(base::StringPrintf(
+      "{\"secret_key\": [%d, %d]}",

[Tim Song, 2014/08/29 17:38:58]

Why not just [private_key, public_key]? Is the ECDH operation commutative?

[tbarzic, 2014/08/29 17:43:39]

Yes, in respect to the key pairs the used keys come from.
(e.g. [key_pair1.private_key, key_pair2.public_key] and [key_pair2.private_key,
key_pair1.public_key] should generate the same result).

[Tim Song, 2014/08/29 17:46:00]

Good to know. Can you mention this explicitly in the comment above. It wasn't
really clear to me.

[tbarzic, 2014/08/29 18:29:46]

Done.

+      private_key_index + public_key_index,
+      private_key_index * public_key_index));
 }
 
 void FakeEasyUnlockClient::CreateSecureMessage(
     const std::string& payload,
-    const std::string& secret_key,
+    const std::string& key,
     const std::string& associated_data,
     const std::string& public_metadata,
     const std::string& verification_key_id,
     const std::string& encryption_type,
     const std::string& signature_type,
     const DataCallback& callback) {
+  callback.Run(base::StringPrintf(
+      "{\"securemessage\": {"
+          "\"payload\": \"%s\","
+          "\"key\": \"%s\","
+          "\"associated_data\": \"%s\","
+          "\"public_metadata\": \"%s\","
+          "\"verification_key_id\": \"%s\","
+          "\"encryption_type\": \"%s\","
+          "\"signature_type\": \"%s\""
+      "}}",
+      payload.c_str(),
+      key.c_str(),
+      associated_data.c_str(),
+      public_metadata.c_str(),
+      verification_key_id.c_str(),
+      encryption_type.c_str(),
+      signature_type.c_str()));
 }
 
 void FakeEasyUnlockClient::UnwrapSecureMessage(
     const std::string& message,
-    const std::string& secret_key,
+    const std::string& key,
     const std::string& associated_data,
     const std::string& encryption_type,
     const std::string& signature_type,
     const DataCallback& callback) {
+  // TODO(tbarzic): Verify that |message| is in the format returned by
+  // |CreateSecureMessage| and extract payload, metadata and
+  // verification_key_id from there.
+  callback.Run(base::StringPrintf(
+      "{\"unwrapped_securemessage\": {"
+          "\"message\": \"%s\","
+          "\"key\": \"%s\","
+          "\"associated_data\": \"%s\","
+          "\"encryption_type\": \"%s\","
+          "\"signature_type\": \"%s\""
+      "}}",
+      message.c_str(),
+      key.c_str(),
+      associated_data.c_str(),
+      encryption_type.c_str(),
+      signature_type.c_str()));
 }
 
 }  // namespace chromeos