Wire up GetKeyDataEx() in Chrome

chromeos/cryptohome/cryptohome_parameters.h

Index: chromeos/cryptohome/cryptohome_parameters.h
diff --git a/chromeos/cryptohome/cryptohome_parameters.h b/chromeos/cryptohome/cryptohome_parameters.h
index d74d5fc1f085341bd28d6fc04b1931c66485d98a..4317ef52f294bca7b48116d0f45279958522d7a9 100644
--- a/chromeos/cryptohome/cryptohome_parameters.h
+++ b/chromeos/cryptohome/cryptohome_parameters.h
@@ -9,6 +9,8 @@
 #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 {
@@ -64,6 +66,36 @@ struct CHROMEOS_EXPORT Authorization {
   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: