tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove no-longer-needed crypto init builtins

Browse source 
Changes to the way FBE works to support lifecycles mean that these
commands aren't needed any more.

Bug: 22358539
Change-Id: Id73339e0aa8070dd688f35b5d59de75236961395
This commit is contained in:
Paul Crowley 2016-01-20 11:20:23 +00:00
parent a9c48fdb28
commit 558d8f4364
2 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
init/builtins.cpp
View file

@ -871,22 +871,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 = {
@ -897,7 +881,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}},
@ -920,7 +903,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}},

3
rootdir/init.rc
View file

@ -408,9 +408,6 @@ on post-fs-data
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