mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 10:04:12 +08:00
KEYS: trusted: Create trusted keys subsystem
Move existing code to trusted keys subsystem. Also, rename files with "tpm" as suffix which provides the underlying implementation. Suggested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
parent
c6f61e5976
commit
47f9c27968
@ -13,7 +13,7 @@
|
||||
#include <crypto/sha.h>
|
||||
#include <asm/unaligned.h>
|
||||
#include <keys/asymmetric-subtype.h>
|
||||
#include <keys/trusted.h>
|
||||
#include <keys/trusted_tpm.h>
|
||||
#include <crypto/asym_tpm_subtype.h>
|
||||
#include <crypto/public_key.h>
|
||||
|
||||
|
@ -65,7 +65,6 @@ header-test- += keys/asymmetric-subtype.h
|
||||
header-test- += keys/asymmetric-type.h
|
||||
header-test- += keys/big_key-type.h
|
||||
header-test- += keys/request_key_auth-type.h
|
||||
header-test- += keys/trusted.h
|
||||
header-test- += kvm/arm_arch_timer.h
|
||||
header-test- += kvm/arm_pmu.h
|
||||
header-test-$(CONFIG_ARM) += kvm/arm_psci.h
|
||||
|
@ -1,6 +1,9 @@
|
||||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
#ifndef __TRUSTED_KEY_H
|
||||
#define __TRUSTED_KEY_H
|
||||
#ifndef __TRUSTED_TPM_H
|
||||
#define __TRUSTED_TPM_H
|
||||
|
||||
#include <keys/trusted-type.h>
|
||||
#include <linux/tpm_command.h>
|
||||
|
||||
/* implementation specific TPM constants */
|
||||
#define MAX_BUF_SIZE 1024
|
@ -28,5 +28,5 @@ obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += keyctl_pkey.o
|
||||
# Key types
|
||||
#
|
||||
obj-$(CONFIG_BIG_KEYS) += big_key.o
|
||||
obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
|
||||
obj-$(CONFIG_TRUSTED_KEYS) += trusted-keys/
|
||||
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/
|
||||
|
7
security/keys/trusted-keys/Makefile
Normal file
7
security/keys/trusted-keys/Makefile
Normal file
@ -0,0 +1,7 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
#
|
||||
# Makefile for trusted keys
|
||||
#
|
||||
|
||||
obj-$(CONFIG_TRUSTED_KEYS) += trusted.o
|
||||
trusted-y += trusted_tpm1.o
|
@ -27,7 +27,7 @@
|
||||
#include <linux/tpm.h>
|
||||
#include <linux/tpm_command.h>
|
||||
|
||||
#include <keys/trusted.h>
|
||||
#include <keys/trusted_tpm.h>
|
||||
|
||||
static const char hmac_alg[] = "hmac(sha1)";
|
||||
static const char hash_alg[] = "sha1";
|
Loading…
Reference in New Issue
Block a user