Wire up GetKeyDataEx() in Chrome

chromeos/cryptohome/cryptohome_parameters.h

 // 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.
 
 #ifndef CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_
 #define CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/memory/scoped_vector.h"
 #include "chromeos/chromeos_export.h"
 
 namespace cryptohome {
 
 enum AuthKeyPrivileges {
   PRIV_MOUNT = 1 << 0,              // Can mount with this key.
   PRIV_ADD = 1 << 1,                // Can add new keys.
   PRIV_REMOVE = 1 << 2,             // Can remove other keys.
   PRIV_MIGRATE = 1 << 3,            // Destroy all keys and replace with new.
   PRIV_AUTHORIZED_UPDATE = 1 << 4,  // Key can be updated in place.
@@ skipping 35 matching lines @@
 struct CHROMEOS_EXPORT Authorization {
   Authorization(const std::string& key, const std::string& label);
   explicit Authorization(const KeyDefinition& key);
 
   bool operator==(const Authorization& other) const;
 
   std::string key;
   std::string label;
 };
 
+// Information about keys returned by GetKeyDataEx().
+struct CHROMEOS_EXPORT RetrievedKeyData {

[Darren Krahn, 2014/08/26 20:14:21]

This seems to simply dup the classes generated by the proto. Is there a reason
why we need to do this instead of just using the proto classes directly?

[bartfab (slow), 2014/08/27 11:53:15]

I followed the design of the other calls abstracted by HomedirMethods. They all
translate from a protobuf to a corresponding struct. I am not sure what the
reasoning behind the original design was. It certainly does encapsulate input
validation and hides the complexity and ugliness of protobuf parsing by passing
around an easier-to-user struct instead.

+  enum Type {
+    TYPE_PASSWORD = 0
+  };
+
+  enum AuthorizationType {
+    AUTHORIZATION_TYPE_HMACSHA256 = 0,
+    AUTHORIZATION_TYPE_AES256CBC_HMACSHA256
+  };
+
+  struct ProviderData {
+    explicit ProviderData(const std::string& name);
+
+    std::string name;
+    scoped_ptr<int64> number;
+    scoped_ptr<std::string> bytes;
+  };
+
+  RetrievedKeyData(Type type, const std::string& label, int64 revision);
+
+  Type type;
+  std::string label;
+  // Privileges associated with key. Combination of |AuthKeyPrivileges| values.
+  int privileges;
+  int64 revision;
+  std::vector<AuthorizationType> authorization_types;
+  ScopedVector<ProviderData> provider_data;
+};
+
 // Parameters for Mount call.
 class CHROMEOS_EXPORT MountParameters {
  public:
   explicit MountParameters(bool ephemeral);
   ~MountParameters();
 
   bool operator==(const MountParameters& other) const;
 
   // If |true|, the mounted home dir will be backed by tmpfs. If |false|, the
   // ephemeral users policy decides whether tmpfs or an encrypted directory is
   // used as the backend.
   bool ephemeral;
 
   // If not empty, home dir will be created with these keys if it exist.
   std::vector<KeyDefinition> create_keys;
 };
 
 }  // namespace cryptohome
 
 #endif  // CHROMEOS_CRYPTOHOME_CRYPTOHOME_PARAMETERS_H_