Commit: 444bcc573987248ec49fddfd624f05cdbf998de6 - system-core (git)

system/core

Commit MetaInfo

• Revision: 444bcc573987248ec49fddfd624f05cdbf998de6 (tree)
• Zeit: 2018-09-11 12:50:10
• Autor: Ethan Yonker <dees_troy@team...>
• Commiter: Sam Mortimer

Log Message

init: add install_keyring for TWRP FBE decrypt

Change-Id: Id7652763ec79bb8679aeb85793f1a748e0d67ff9

Ändern Zusammenfassung

• modified: init/builtins.cpp

Diff

--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -643,6 +643,16 @@ static int queue_fs_event(int code) {
     return ret;
 }
 
+static int do_install_keyring(const std::vector<std::string>& args) {
+    if (e4crypt_install_keyring()) {
+        ERROR("failed to install keyring\n");
+        return -1;
+    }
+    property_set("ro.crypto.state", "encrypted");
+    property_set("ro.crypto.type", "file");
+    return 0;
+}
+
 /* mount_all <fstab> [ <path> ]* [--<options>]*
  *
  * This function might request a reboot, in which case it will
@@ -1185,6 +1195,7 @@ BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
         {"ifup",                    {1,     1,    do_ifup}},
         {"init_user0",              {0,     0,    do_init_user0}},
         {"insmod",                  {1,     kMax, do_insmod}},
+        {"install_keyring",         {0,     0,    do_install_keyring}},
         {"installkey",              {1,     1,    do_installkey}},
         {"load_persist_props",      {0,     0,    do_load_persist_props}},
         {"load_system_props",       {0,     0,    do_load_system_props}},