Merge "Remove no-longer-needed crypto init builtins"
diff --git a/init/builtins.cpp b/init/builtins.cpp
index 232adec..5918609 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -884,22 +884,6 @@
do_installkeys_ensure_dir_exists);
}
-static int do_setusercryptopolicies(const std::vector<std::string>& args) {
- if (!is_file_crypto()) {
- return 0;
- }
- return e4crypt_set_user_crypto_policies(args[1].c_str());
-}
-
-static int do_createuserkey(const std::vector<std::string>& args) {
- if (!is_file_crypto()) {
- return 0;
- }
- return e4crypt_create_user_key(atoi(args[1].c_str()),
- atoi(args[2].c_str()),
- atoi(args[3].c_str()));
-}
-
BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const {
constexpr std::size_t kMax = std::numeric_limits<std::size_t>::max();
static const Map builtin_functions = {
@@ -910,7 +894,6 @@
{"class_start", {1, 1, do_class_start}},
{"class_stop", {1, 1, do_class_stop}},
{"copy", {2, 2, do_copy}},
- {"createuserkey", {3, 3, do_createuserkey}},
{"domainname", {1, 1, do_domainname}},
{"enable", {1, 1, do_enable}},
{"exec", {1, kMax, do_exec}},
@@ -933,7 +916,6 @@
{"rmdir", {1, 1, do_rmdir}},
{"setprop", {2, 2, do_setprop}},
{"setrlimit", {3, 3, do_setrlimit}},
- {"setusercryptopolicies", {1, 1, do_setusercryptopolicies}},
{"start", {1, 1, do_start}},
{"stop", {1, 1, do_stop}},
{"swapon_all", {1, 1, do_swapon_all}},
diff --git a/rootdir/init.rc b/rootdir/init.rc
index b5a905b..a839729 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -408,9 +408,6 @@
symlink /data/data /data/user/0
- setusercryptopolicies /data/user
- createuserkey 0 0 0
-
# Reload policy from /data/security if present.
setprop selinux.reload_policy 1