Merge "Remove no-longer-needed crypto init builtins" (65f54a8e) · Commits · e / os / android_system_core

init/builtins.cpp

+0 −18

Original line number	Diff line number	Diff line
		@@ -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}},

+0 −3

Original line number	Diff line number	Diff line
		@@ -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