cros: Create cryptohome keys for Easy sign-in.

chromeos/cryptohome/homedir_methods.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/cryptohome/homedir_methods.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "chromeos/dbus/cryptohome/key.pb.h"
 #include "chromeos/dbus/cryptohome/rpc.pb.h"
@@ skipping 26 matching lines @@
   if (key_def.privileges != 0) {
     KeyPrivileges* privileges = data->mutable_privileges();
     privileges->set_mount(key_def.privileges & PRIV_MOUNT);
     privileges->set_add(key_def.privileges & PRIV_ADD);
     privileges->set_remove(key_def.privileges & PRIV_REMOVE);
     privileges->set_update(key_def.privileges & PRIV_MIGRATE);
     privileges->set_authorized_update(key_def.privileges &
                                       PRIV_AUTHORIZED_UPDATE);
   }
 
-  if (key_def.encryption_key.empty() && key_def.signature_key.empty())
-    return;
+  const bool has_auth_data =
+      !key_def.encryption_key.empty() || !key_def.signature_key.empty();
+  if (has_auth_data) {
+    KeyAuthorizationData* auth_data = data->add_authorization_data();
+    auth_data->set_type(
+        KeyAuthorizationData::KEY_AUTHORIZATION_TYPE_HMACSHA256);
+    if (!key_def.encryption_key.empty()) {
+      KeyAuthorizationSecret* secret = auth_data->add_secrets();
+      secret->mutable_usage()->set_encrypt(true);
+      secret->set_symmetric_key(key_def.encryption_key);
+    }
+    if (!key_def.signature_key.empty()) {
+      KeyAuthorizationSecret* secret = auth_data->add_secrets();
+      secret->mutable_usage()->set_sign(true);
+      secret->set_symmetric_key(key_def.signature_key);
+    }
+  }

[Darren Krahn, 2014/09/12 16:35:17]

Also collides with https://codereview.chromium.org/526353002/ -- you may want to
coordinate with bartfab@.

[xiyuan, 2014/09/12 19:10:12]

Rebased.

 
-  KeyAuthorizationData* auth_data = data->add_authorization_data();
-  auth_data->set_type(KeyAuthorizationData::KEY_AUTHORIZATION_TYPE_HMACSHA256);
-  if (!key_def.encryption_key.empty()) {
-    KeyAuthorizationSecret* secret = auth_data->add_secrets();
-    secret->mutable_usage()->set_encrypt(true);
-    secret->set_symmetric_key(key_def.encryption_key);
-  }
-  if (!key_def.signature_key.empty()) {
-    KeyAuthorizationSecret* secret = auth_data->add_secrets();
-    secret->mutable_usage()->set_sign(true);
-    secret->set_symmetric_key(key_def.signature_key);
+  if (!key_def.provider_data.empty()) {
+    KeyProviderData* provider_data = data->mutable_provider_data();
+    for (size_t i = 0; i < key_def.provider_data.size(); ++i) {
+      const ProviderDataEntry& entry_data = key_def.provider_data[i];
+
+      KeyProviderData_Entry* entry = provider_data->add_entry();
+      entry->set_name(entry_data.name);
+      if (entry_data.has_number)
+        entry->set_number(entry_data.number);
+      if (entry_data.has_bytes)
+        entry->set_bytes(entry_data.bytes);
+    }
   }
 }
 
 // Fill identification protobuffer.
 void FillIdentificationProtobuf(const Identification& id,
                                 cryptohome::AccountIdentifier* id_proto) {
   id_proto->set_email(id.user_id);
 }
 
 // Fill authorization protobuffer.
@@ skipping 251 matching lines @@
         }
       }
 
       // Extract |provider_data|.
       for (RepeatedPtrField<KeyProviderData::Entry>::const_iterator
               provider_data_it = it->provider_data().entry().begin();
            provider_data_it != it->provider_data().entry().end();
            ++provider_data_it) {
         // Extract |name|.
         key_data->provider_data.push_back(
-            new RetrievedKeyData::ProviderData(provider_data_it->name()));
-        RetrievedKeyData::ProviderData* provider_data =
-            key_data->provider_data.back();
+            ProviderDataEntry(provider_data_it->name()));
+        ProviderDataEntry* provider_data = &key_data->provider_data.back();
 
         int data_items = 0;
 
         // Extract |number|.
         if (provider_data_it->has_number()) {
-          provider_data->number.reset(new int64(provider_data_it->number()));
+          provider_data->SetNumber(provider_data_it->number());
           ++data_items;
         }
 
         // Extract |bytes|.
         if (provider_data_it->has_bytes()) {
-          provider_data->bytes.reset(
-              new std::string(provider_data_it->bytes()));
+          provider_data->SetBytes(provider_data_it->bytes());
           ++data_items;
         }
 
         DCHECK_EQ(1, data_items);
       }
     }
 
     callback.Run(true, MOUNT_ERROR_NONE, key_data_list.Pass());
   }
 
@@ skipping 73 matching lines @@
   }
   delete g_homedir_methods;
   g_homedir_methods = NULL;
   VLOG(1) << "HomedirMethods Shutdown completed";
 }
 
 // static
 HomedirMethods* HomedirMethods::GetInstance() { return g_homedir_methods; }
 
 }  // namespace cryptohome