Merge changes from topic "remove-libkeyutils" into main (2bd79db9) · Commits · e / os / android_system_core

libkeyutils/.clang-format

deleted120000 → 0

+0 −1

Original line number	Diff line number	Diff line
		../.clang-format-2
		No newline at end of file

libkeyutils/Android.bp

deleted100644 → 0

+0 −31

Original line number	Diff line number	Diff line
		package {
		default_applicable_licenses: ["system_core_libkeyutils_license"],
		}

		license {
		name: "system_core_libkeyutils_license",
		visibility: [":__subpackages__"],
		license_kinds: ["SPDX-license-identifier-BSD"],
		license_text: ["NOTICE"],
		}

		cc_library {
		name: "libkeyutils",
		cflags: ["-Werror"],
		defaults: ["linux_bionic_supported"],
		ramdisk_available: true,
		vendor_ramdisk_available: true,
		recovery_available: true,
		export_include_dirs: ["include/"],
		local_include_dirs: ["include/"],
		srcs: ["keyutils.cpp"],
		stl: "none",
		}

		cc_test {
		name: "libkeyutils-tests",
		cflags: ["-Werror"],
		shared_libs: ["libkeyutils"],
		srcs: ["keyutils_test.cpp"],
		test_suites: ["device-tests"],
		}

libkeyutils/NOTICE

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		Copyright (C) 2017 The Android Open Source Project
		All rights reserved.

		Redistribution and use in source and binary forms, with or without
		modification, are permitted provided that the following conditions
		are met:
		* Redistributions of source code must retain the above copyright
		notice, this list of conditions and the following disclaimer.
		* Redistributions in binary form must reproduce the above copyright
		notice, this list of conditions and the following disclaimer in
		the documentation and/or other materials provided with the
		distribution.

		THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
		COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
		INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
		BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
		OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
		AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		SUCH DAMAGE.

libkeyutils/include/keyutils.h

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
		* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
		* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
		* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
		* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
		* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		*/

		#ifndef _KEYUTILS_H_
		#define _KEYUTILS_H_

		#include <linux/keyctl.h>
		#include <stdint.h>
		#include <sys/cdefs.h>

		__BEGIN_DECLS

		typedef int32_t key_serial_t;

		key_serial_t add_key(const char* type, const char* description, const void* payload,
		size_t payload_length, key_serial_t ring_id);

		key_serial_t keyctl_get_keyring_ID(key_serial_t id, int create);

		long keyctl_revoke(key_serial_t id); /* TODO: remove this */

		long keyctl_search(key_serial_t ring_id, const char* type, const char* description,
		key_serial_t dest_ring_id);

		long keyctl_setperm(key_serial_t id, int permissions);

		long keyctl_unlink(key_serial_t key, key_serial_t keyring);

		long keyctl_restrict_keyring(key_serial_t keyring, const char* type, const char* restriction);

		long keyctl_get_security(key_serial_t key, char* buffer, size_t buflen);

		__END_DECLS

		#endif

libkeyutils/keyutils.cpp

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2017 The Android Open Source Project
		* All rights reserved.
		*
		* Redistribution and use in source and binary forms, with or without
		* modification, are permitted provided that the following conditions
		* are met:
		* * Redistributions of source code must retain the above copyright
		* notice, this list of conditions and the following disclaimer.
		* * Redistributions in binary form must reproduce the above copyright
		* notice, this list of conditions and the following disclaimer in
		* the documentation and/or other materials provided with the
		* distribution.
		*
		* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
		* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
		* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
		* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
		* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
		* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
		* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
		* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
		* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
		* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
		* SUCH DAMAGE.
		*/

		#include <keyutils.h>

		#include <stdarg.h>
		#include <sys/syscall.h>
		#include <unistd.h>

		// keyctl(2) is deliberately not exposed. Callers should use the typed APIs instead.

		key_serial_t add_key(const char* type, const char* description, const void* payload,
		size_t payload_length, key_serial_t ring_id) {
		return syscall(__NR_add_key, type, description, payload, payload_length, ring_id);
		}

		key_serial_t keyctl_get_keyring_ID(key_serial_t id, int create) {
		return syscall(__NR_keyctl, KEYCTL_GET_KEYRING_ID, id, create);
		}

		long keyctl_revoke(key_serial_t id) {
		return syscall(__NR_keyctl, KEYCTL_REVOKE, id);
		}

		long keyctl_search(key_serial_t ring_id, const char* type, const char* description,
		key_serial_t dest_ring_id) {
		return syscall(__NR_keyctl, KEYCTL_SEARCH, ring_id, type, description, dest_ring_id);
		}

		long keyctl_setperm(key_serial_t id, int permissions) {
		return syscall(__NR_keyctl, KEYCTL_SETPERM, id, permissions);
		}

		long keyctl_unlink(key_serial_t key, key_serial_t keyring) {
		return syscall(__NR_keyctl, KEYCTL_UNLINK, key, keyring);
		}

		long keyctl_restrict_keyring(key_serial_t keyring, const char* type, const char* restriction) {
		return syscall(__NR_keyctl, KEYCTL_RESTRICT_KEYRING, keyring, type, restriction);
		}

		long keyctl_get_security(key_serial_t id, char* buffer, size_t buflen) {
		return syscall(__NR_keyctl, KEYCTL_GET_SECURITY, id, buffer, buflen);
		}