commit 395039f0070abed5f6b3617786956ee3e62fe9b5
author Lenka Trochtova <ltrochtova@google.com> Wed Nov 25 10:13:03 2015 +0100
committer Lenka Trochtova <ltrochtova@google.com> Tue Dec 08 11:10:59 2015 +0100
tree 29e5873f65a8eb5ccbd50df2589d3aac84ade7a9
parent fc505c3ff6c1ba3a061e7e8b3f2236be90712a80

Introduce support for ephemeral users.

BUG: 24883058

Change-Id: I77d4757f87214166e7c41c7eb0d06b1cd5f06b20

CryptCommandListener.cpp

diff --git a/CryptCommandListener.cpp b/CryptCommandListener.cpp
index ac2607a..09bc6c0 100644
--- a/CryptCommandListener.cpp
+++ b/CryptCommandListener.cpp
@@ -363,9 +363,10 @@
         dumpArgs(argc, argv, -1);
         rc = cryptfs_isConvertibleToFBE();
 
-    } else if (cmd == "create_user_key" && argc > 3) {
-        // create_user_key [user] [serial]
-        return sendGenericOkFail(cli, e4crypt_create_user_key(atoi(argv[2])));
+    } else if (cmd == "create_user_key" && argc > 4) {
+        // create_user_key [user] [serial] [ephemeral]
+        return sendGenericOkFail(cli,
+                e4crypt_create_user_key(atoi(argv[2]), atoi(argv[3]) != 0));
 
     } else if (cmd == "destroy_user_key" && argc > 2) {
         // destroy_user_key [user]
@@ -379,10 +380,10 @@
         // lock_user_key [user]
         return sendGenericOkFail(cli, e4crypt_lock_user_key(atoi(argv[2])));
 
-    } else if (cmd == "prepare_user_storage" && argc > 4) {
-        // prepare_user_storage [uuid] [user] [serial]
-        return sendGenericOkFail(cli,
-                e4crypt_prepare_user_storage(parseNull(argv[2]), atoi(argv[3])));
+    } else if (cmd == "prepare_user_storage" && argc > 5) {
+        // prepare_user_storage [uuid] [user] [serial] [ephemeral]
+        return sendGenericOkFail(cli, e4crypt_prepare_user_storage(
+                parseNull(argv[2]), atoi(argv[3]), atoi(argv[4]) != 0));
 
     } else {
         dumpArgs(argc, argv, -1);