aboutsummaryrefslogtreecommitdiff
path: root/dbus/cryptohome
diff options
context:
space:
mode:
authorPavol Marko <pmarko@chromium.org>2017-08-24 15:10:03 +0200
committerchrome-bot <chrome-bot@chromium.org>2017-08-30 13:04:20 -0700
commit27810c6ba2d3f136811e516fe07d5562704a92ee (patch)
treed514366c4d3d4e709bddf856e5b8b748eaadacc2 /dbus/cryptohome
parentd3b70a23a22ab8baa87367c6aaa77944ab965e18 (diff)
downloadsystem_api-27810c6ba2d3f136811e516fe07d5562704a92ee.tar.gz
system_api: Add MigrateToDircryptoEx to cryptohome API
Add method MigrateToDircryptoEx to cryptohome API. BUG=chromium:747907 TEST=none Change-Id: Ide6f8d6dec9b70079abcfed25494edeee4f56ea3 Reviewed-on: https://chromium-review.googlesource.com/632476 Commit-Ready: Pavol Marko <pmarko@chromium.org> Tested-by: Pavol Marko <pmarko@chromium.org> Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Diffstat (limited to 'dbus/cryptohome')
-rw-r--r--dbus/cryptohome/dbus-constants.h1
-rw-r--r--dbus/cryptohome/rpc.proto11
2 files changed, 12 insertions, 0 deletions
diff --git a/dbus/cryptohome/dbus-constants.h b/dbus/cryptohome/dbus-constants.h
index 6b705ea..23e1bde 100644
--- a/dbus/cryptohome/dbus-constants.h
+++ b/dbus/cryptohome/dbus-constants.h
@@ -124,6 +124,7 @@ const char kCryptohomeSetFirmwareManagementParameters[] =
const char kCryptohomeRemoveFirmwareManagementParameters[] =
"RemoveFirmwareManagementParameters";
const char kCryptohomeMigrateToDircrypto[] = "MigrateToDircrypto";
+const char kCryptohomeMigrateToDircryptoEx[] = "MigrateToDircryptoEx";
const char kCryptohomeNeedsDircryptoMigration[] = "NeedsDircryptoMigration";
// Signals
diff --git a/dbus/cryptohome/rpc.proto b/dbus/cryptohome/rpc.proto
index 1d81a2d..1b5d7c1 100644
--- a/dbus/cryptohome/rpc.proto
+++ b/dbus/cryptohome/rpc.proto
@@ -341,3 +341,14 @@ message GetAccountDiskUsageReply {
// The size of cryptohome in bytes.
optional int64 size = 1;
}
+
+// Request parameters for MigrateToDircryptoEx.
+// TODO(pmarko): Update comment when MigrateToDircryptoEx gets renamed to
+// MigrateToDircrypto: crbug.com/758837.
+message MigrateToDircryptoRequest {
+ // Next ID to use: 2
+
+ // If true, only a few paths (specified in cryptohomed) that are necessary for
+ // a working profile will be migrated. Most user data will be wiped.
+ optional bool minimal_migration = 1;
+}