commit 84b0bab58fcc7f225e9a17a15c531b0c2fc509c5
author Paul Lawrence <paullawrence@google.com> Thu Mar 26 14:53:19 2015 +0000
committer Paul Lawrence <paullawrence@google.com> Thu Mar 26 14:53:19 2015 +0000
tree 513c4de94f6065a159e673b3e00386a229e75bbd
parent 6095afc115fe3a4b7d151b4fcc164e00f9df9659

Revert "Adding e4crypt support"

This reverts commit 6095afc115fe3a4b7d151b4fcc164e00f9df9659.

Change-Id: Icedfe0036223d7f42eaaefc4a35ad0f2efb14e4e

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index 9ff6b4a..e659cfa 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -29,7 +29,6 @@
 #include <sys/wait.h>
 #include <unistd.h>
 #include <linux/loop.h>
-#include <ext4_crypt.h>
 
 #include <selinux/selinux.h>
 #include <selinux/label.h>
@@ -303,7 +302,7 @@
         }
     }
 
-    return e4crypt_set_directory_policy(args[1]);
+    return 0;
 }
 
 static struct {
@@ -515,36 +514,6 @@
         ERROR("fs_mgr_mount_all suggested recovery, so wiping data via recovery.\n");
         ret = wipe_data_via_recovery();
         /* If reboot worked, there is no return. */
-    } else if (ret == FS_MGR_MNTALL_DEV_DEFAULT_FILE_ENCRYPTED) {
-        // We have to create the key files here. Only init can call make_dir,
-        // and we can't do it from fs_mgr as then fs_mgr would depend on
-        // make_dir creating a circular dependency.
-        fstab = fs_mgr_read_fstab(args[1]);
-        for (int i = 0; i < fstab->num_entries; ++i) {
-            if (fs_mgr_is_file_encrypted(&fstab->recs[i])) {
-                if (e4crypt_create_device_key(fstab->recs[i].mount_point)) {
-                    ERROR("Could not create device key on %s"
-                          " - continue unencrypted\n",
-                          fstab->recs[i].mount_point);
-                }
-            }
-        }
-        fs_mgr_free_fstab(fstab);
-
-        if (e4crypt_install_keyring()) {
-            return -1;
-        }
-        property_set("ro.crypto.state", "encrypted");
-
-        // Although encrypted, we have device key, so we do not need to
-        // do anything different from the nonencrypted case.
-        action_for_each_trigger("nonencrypted", action_add_queue_tail);
-    } else if (ret == FS_MGR_MNTALL_DEV_NON_DEFAULT_FILE_ENCRYPTED) {
-        if (e4crypt_install_keyring()) {
-            return -1;
-        }
-        property_set("ro.crypto.state", "encrypted");
-        property_set("vold.decrypt", "trigger_restart_min_framework");
     } else if (ret > 0) {
         ERROR("fs_mgr_mount_all returned unexpected error %d\n", ret);
     }
@@ -897,12 +866,3 @@
     } else
         return -1;
 }
-
-int do_installkey(int nargs, char **args)
-{
-    if (nargs == 2) {
-        return e4crypt_install_key(args[1]);
-    }
-
-    return -1;
-}