summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Lawrence <paullawrence@google.com>2016-02-02 10:38:38 -0800
committerPaul Lawrence <paullawrence@google.com>2016-02-02 10:40:01 -0800
commit88bebba43c3b25c6dca9190cd8d030022f4f2356 (patch)
treed3b45621c57f7ad2b1d8328f019c2031068e2ab0
parent8b076e4c05119645b4aeb6f16cb47ae2be1dde77 (diff)
downloadextras-88bebba43c3b25c6dca9190cd8d030022f4f2356.tar.gz
Remove e4crypt_non_default_key
Change: https://googleplex-android-review.git.corp.google.com/#/c/857155 means this is no longer called since it is assumed always to be false Change-Id: I12755ca26e33b8eeafaab3b5373a2d0f1c7abf46
-rw-r--r--ext4_utils/ext4_crypt.cpp6
-rw-r--r--ext4_utils/ext4_crypt_init_extensions.h1
2 files changed, 0 insertions, 7 deletions
diff --git a/ext4_utils/ext4_crypt.cpp b/ext4_utils/ext4_crypt.cpp
index 886d17a1..2ffbe8be 100644
--- a/ext4_utils/ext4_crypt.cpp
+++ b/ext4_utils/ext4_crypt.cpp
@@ -123,9 +123,3 @@ int do_policy_set(const char *directory, const char *policy, int policy_length)
directory, policy[0], policy[1], policy[2], policy[3]);
return 0;
}
-
-bool e4crypt_non_default_key(const char* dir)
-{
- UnencryptedProperties props(dir);
- return props.Get<int>(properties::is_default, 1) != 1;
-}
diff --git a/ext4_utils/ext4_crypt_init_extensions.h b/ext4_utils/ext4_crypt_init_extensions.h
index f008f814..d7bf3b50 100644
--- a/ext4_utils/ext4_crypt_init_extensions.h
+++ b/ext4_utils/ext4_crypt_init_extensions.h
@@ -10,7 +10,6 @@ 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);
-bool e4crypt_non_default_key(const char* path);
int e4crypt_do_init_user0();
int do_policy_set(const char *directory, const char *policy, int policy_length);