diff options
| author | Paul Crowley <paulcrowley@google.com> | 2016-01-21 11:16:33 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-21 11:16:33 +0000 |
| commit | dbe902174b49f12c5870be0245c30e5fe3deb83b (patch) | |
| tree | 23fa8ced2835e3462c44bc6e65c50b9747ad7c84 /init/builtins.cpp | |
| parent | 16e22f9a4fc274e05a34fcb8bff74b0967881ece (diff) | |
| parent | 3e76ef7558aaafd8e61263f02ff18ef0fd190bac (diff) | |
Merge "Remove no-longer-needed crypto init builtins"
Diffstat (limited to 'init/builtins.cpp')
| -rw-r--r-- | init/builtins.cpp | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/init/builtins.cpp b/init/builtins.cpp index 232adecaa8..5918609ed0 100644 --- a/init/builtins.cpp +++ b/init/builtins.cpp @@ -884,22 +884,6 @@ static int do_installkey(const std::vector<std::string>& args) { 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 @@ BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { {"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 @@ BuiltinFunctionMap::Map& BuiltinFunctionMap::map() const { {"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}}, |