diff options
| author | Tom Cherry <tomcherry@google.com> | 2017-04-03 21:58:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-04-03 21:58:45 +0000 |
| commit | 2fbc9b893f804e904a73505312e7d9a4ab80fcff (patch) | |
| tree | 15cd72bf3474465262204d1f1eb98582b6e64457 | |
| parent | 4708f734e519d52b1fb050e9969fcaf37e033af1 (diff) | |
| parent | 1f3273ff4638175a3dbccded99d020d5f550419c (diff) | |
| download | extras-2fbc9b893f804e904a73505312e7d9a4ab80fcff.tar.gz | |
Merge "Removed e4crypt_create_device_key" into oc-dev
| -rw-r--r-- | ext4_utils/ext4_crypt_init_extensions.cpp | 17 | ||||
| -rw-r--r-- | ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h | 2 |
2 files changed, 0 insertions, 19 deletions
diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp index 55a1c1cd..ee8bfbed 100644 --- a/ext4_utils/ext4_crypt_init_extensions.cpp +++ b/ext4_utils/ext4_crypt_init_extensions.cpp @@ -41,23 +41,6 @@ static const std::string arbitrary_sequence_number = "42"; static const int vold_command_timeout_ms = 60 * 1000; -int e4crypt_create_device_key(const char* dir, - int ensure_dir_exists(const char*)) -{ - // Make sure folder exists. Use make_dir to set selinux permissions. - std::string unencrypted_dir = std::string(dir) + e4crypt_unencrypted_folder; - if (ensure_dir_exists(unencrypted_dir.c_str())) { - PLOG(ERROR) << "Failed to create " << unencrypted_dir; - return -1; - } - - const char* argv[] = { "/system/bin/vdc", "--wait", "cryptfs", "enablefilecrypto" }; - int rc = android_fork_execvp_ext(arraysize(argv), (char**) argv, NULL, false, - LOG_KLOG, false, NULL, NULL, 0); - LOG(INFO) << "enablefilecrypto result: " << rc; - return rc; -} - int e4crypt_install_keyring() { key_serial_t device_keyring = add_key("keyring", "e4crypt", 0, 0, diff --git a/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h b/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h index 2cf98de4..e208b451 100644 --- a/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h +++ b/ext4_utils/include/ext4_utils/ext4_crypt_init_extensions.h @@ -26,8 +26,6 @@ __BEGIN_DECLS // These functions assume they are being called from init // They will not operate properly outside of init int e4crypt_install_keyring(); -int e4crypt_create_device_key(const char* path, - int ensure_dir_exists(const char* dir)); int e4crypt_set_directory_policy(const char* path); int e4crypt_do_init_user0(); |