Commit 47f9c279 authored by Sumit Garg's avatar Sumit Garg Committed by Jarkko Sakkinen
Browse files

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: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarSumit Garg <sumit.garg@linaro.org>
Reviewed-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
parent c6f61e59

crypto/asymmetric_keys/asym_tpm.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <crypto/sha.h>

#include <crypto/sha.h>

#include <asm/unaligned.h>

#include <asm/unaligned.h>

#include <keys/asymmetric-subtype.h>

#include <keys/asymmetric-subtype.h>

#include <keys/trusted.h>

#include <keys/trusted_tpm.h>

#include <crypto/asym_tpm_subtype.h>

#include <crypto/asym_tpm_subtype.h>

#include <crypto/public_key.h>

#include <crypto/public_key.h>

include/Kbuild

+0 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ header-test- += keys/asymmetric-subtype.h 
header-test-			+= keys/asymmetric-type.h

header-test-			+= keys/asymmetric-type.h

header-test-			+= keys/big_key-type.h

header-test-			+= keys/big_key-type.h

header-test-			+= keys/request_key_auth-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_arch_timer.h

header-test-			+= kvm/arm_pmu.h

header-test-			+= kvm/arm_pmu.h

header-test-$(CONFIG_ARM)	+= kvm/arm_psci.h

header-test-$(CONFIG_ARM)	+= kvm/arm_psci.h

include/keys/trusted.h→include/keys/trusted_tpm.h

+5 −2
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __TRUSTED_KEY_H

#ifndef __TRUSTED_TPM_H

#define __TRUSTED_KEY_H

#define __TRUSTED_TPM_H



#include <keys/trusted-type.h>

#include <linux/tpm_command.h>





/* implementation specific TPM constants */

/* implementation specific TPM constants */

#define MAX_BUF_SIZE			1024

#define MAX_BUF_SIZE			1024

security/keys/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,5 +28,5 @@ obj-$(CONFIG_ASYMMETRIC_KEY_TYPE) += keyctl_pkey.o 
# Key types

# Key types

#

#

obj-$(CONFIG_BIG_KEYS) += big_key.o

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/
 
obj-$(CONFIG_ENCRYPTED_KEYS) += encrypted-keys/

security/keys/trusted-keys/Makefile

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# Makefile for trusted keys

#



obj-$(CONFIG_TRUSTED_KEYS) += trusted.o

trusted-y += trusted_tpm1.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE