| Message ID | 1565682784-10234-4-git-send-email-sumit.garg@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add generic trusted keys framework/subsystem | expand |
On Tue, Aug 13, 2019 at 01:23:02PM +0530, Sumit Garg wrote: > 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> > --- > crypto/asymmetric_keys/asym_tpm.c | 2 +- > include/keys/{trusted.h => trusted_tpm.h} | 4 ++-- > security/keys/Makefile | 2 +- > security/keys/trusted-keys/Makefile | 7 +++++++ > security/keys/{trusted.c => trusted-keys/trusted-tpm.c} | 2 +- > 5 files changed, 12 insertions(+), 5 deletions(-) > rename include/keys/{trusted.h => trusted_tpm.h} (98%) > create mode 100644 security/keys/trusted-keys/Makefile > rename security/keys/{trusted.c => trusted-keys/trusted-tpm.c} (99%) Would prefer trusted_tpm.c. /Jarkko
On Mon, Aug 19, 2019 at 08:04:58PM +0300, Jarkko Sakkinen wrote: > On Tue, Aug 13, 2019 at 01:23:02PM +0530, Sumit Garg wrote: > > 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> > > --- > > crypto/asymmetric_keys/asym_tpm.c | 2 +- > > include/keys/{trusted.h => trusted_tpm.h} | 4 ++-- > > security/keys/Makefile | 2 +- > > security/keys/trusted-keys/Makefile | 7 +++++++ > > security/keys/{trusted.c => trusted-keys/trusted-tpm.c} | 2 +- > > 5 files changed, 12 insertions(+), 5 deletions(-) > > rename include/keys/{trusted.h => trusted_tpm.h} (98%) > > create mode 100644 security/keys/trusted-keys/Makefile > > rename security/keys/{trusted.c => trusted-keys/trusted-tpm.c} (99%) > > Would prefer trusted_tpm.c. Actually, trusted_tpm1.c. /Jarkko
On Mon, 19 Aug 2019 at 22:36, Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> wrote: > > On Mon, Aug 19, 2019 at 08:04:58PM +0300, Jarkko Sakkinen wrote: > > On Tue, Aug 13, 2019 at 01:23:02PM +0530, Sumit Garg wrote: > > > 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> > > > --- > > > crypto/asymmetric_keys/asym_tpm.c | 2 +- > > > include/keys/{trusted.h => trusted_tpm.h} | 4 ++-- > > > security/keys/Makefile | 2 +- > > > security/keys/trusted-keys/Makefile | 7 +++++++ > > > security/keys/{trusted.c => trusted-keys/trusted-tpm.c} | 2 +- > > > 5 files changed, 12 insertions(+), 5 deletions(-) > > > rename include/keys/{trusted.h => trusted_tpm.h} (98%) > > > create mode 100644 security/keys/trusted-keys/Makefile > > > rename security/keys/{trusted.c => trusted-keys/trusted-tpm.c} (99%) > > > > Would prefer trusted_tpm.c. > > Actually, trusted_tpm1.c. > Okay. -Sumit > /Jarkko
diff --git a/crypto/asymmetric_keys/asym_tpm.c b/crypto/asymmetric_keys/asym_tpm.c index 76d2ce3..ec3f309 100644 --- a/crypto/asymmetric_keys/asym_tpm.c +++ b/crypto/asymmetric_keys/asym_tpm.c @@ -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> diff --git a/include/keys/trusted.h b/include/keys/trusted_tpm.h similarity index 98% rename from include/keys/trusted.h rename to include/keys/trusted_tpm.h index 29e3e9b..9bdf5f4 100644 --- a/include/keys/trusted.h +++ b/include/keys/trusted_tpm.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __TRUSTED_KEY_H -#define __TRUSTED_KEY_H +#ifndef __TRUSTED_TPM_H +#define __TRUSTED_TPM_H /* implementation specific TPM constants */ #define MAX_BUF_SIZE 1024 diff --git a/security/keys/Makefile b/security/keys/Makefile index 9cef540..074f275 100644 --- a/security/keys/Makefile +++ b/security/keys/Makefile @@ -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/ diff --git a/security/keys/trusted-keys/Makefile b/security/keys/trusted-keys/Makefile new file mode 100644 index 0000000..4e8963a --- /dev/null +++ b/security/keys/trusted-keys/Makefile @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for trusted keys +# + +obj-$(CONFIG_TRUSTED_KEYS) += trusted.o +trusted-y += trusted-tpm.o diff --git a/security/keys/trusted.c b/security/keys/trusted-keys/trusted-tpm.c similarity index 99% rename from security/keys/trusted.c rename to security/keys/trusted-keys/trusted-tpm.c index f7134d6..66687e7 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted-keys/trusted-tpm.c @@ -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";
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> --- crypto/asymmetric_keys/asym_tpm.c | 2 +- include/keys/{trusted.h => trusted_tpm.h} | 4 ++-- security/keys/Makefile | 2 +- security/keys/trusted-keys/Makefile | 7 +++++++ security/keys/{trusted.c => trusted-keys/trusted-tpm.c} | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) rename include/keys/{trusted.h => trusted_tpm.h} (98%) create mode 100644 security/keys/trusted-keys/Makefile rename security/keys/{trusted.c => trusted-keys/trusted-tpm.c} (99%) -- 2.7.4