From patchwork Tue Aug 6 13:37:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 170668 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5722392ile; Tue, 6 Aug 2019 06:38:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpe7wFAbtI3nFsRD0cqxbtwyUaiz2mvJp5qElLIpQ4usMZvAvJlpLZJSDraNlkGfa/6YSl X-Received: by 2002:a17:902:a413:: with SMTP id p19mr3321797plq.134.1565098718263; Tue, 06 Aug 2019 06:38:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565098718; cv=none; d=google.com; s=arc-20160816; b=OM0tz28eewR/2A6nNlCa1ZwEmKEqNXmnvtDSBfzbxcoOwGM2Zxh9wXEO7CPeYdfhuD HRewBzXnKBA2MyZmVtQj4MeoHOL0RscXfQLgip217iPAwTuUYZSo4LWzIB281qI2p2rY CLrihPpL6Sr7dALW0ogJ+EUcplqmPvaeW9kqBz/cIQ5mrb9ME/7ElAPvubh9v0LoEB1C Xk5nw62MLgr1a/lB4TCrJVBHsUgw2zbxZtD/JerA/mznEM05h9Y46FcTqvk6G+QLBXe2 L8NXikbYjRBWxWmmhP4597cXTJ+Z0u/0ilhLAlZCWbXyo4y88ubz5rKf2NURjmapYcB9 oAqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=vl9Wpi/Syv/6aGqe6I7JLyQ+9QJLPAtQrqCkcLZrp+g=; b=h/vbp0UL0Jn0I6CkuPDumWQNGzFlL+cTanZpAeEK9iNbaYy7Sp2j40i408yy/FtdzL 1YSU+jy0izCE4dBszu3ZCsvvs8b+NsrWZVfGEF3bomQGLedVtjaU51ikfjXn2FbLSl+J sBEFnBvtmDj/cM6zP1+L197NoPmgbQHQeGPSRj5N5jCWrSOv6O+0/aIdMlE8J4NPrsd5 iKxWegJ82HCh/HJUWXQLXEhBiT5+jdR7rAItnydsTYYUEtxtqqPGu/VJMps6hnjSyEx6 v01ihfX5YdpXiBuqCUd6+qIAVhcPn5DYbzk7NPZbRRK7V67AszmBC+7dS7AWKMc9rBJl GH1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AmytCpKH; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z18si14580442pjt.94.2019.08.06.06.38.38; Tue, 06 Aug 2019 06:38:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=AmytCpKH; spf=pass (google.com: best guess record for domain of linux-crypto-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731608AbfHFNih (ORCPT + 3 others); Tue, 6 Aug 2019 09:38:37 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:43611 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727540AbfHFNih (ORCPT ); Tue, 6 Aug 2019 09:38:37 -0400 Received: by mail-pg1-f196.google.com with SMTP id r26so5664429pgl.10 for ; Tue, 06 Aug 2019 06:38:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vl9Wpi/Syv/6aGqe6I7JLyQ+9QJLPAtQrqCkcLZrp+g=; b=AmytCpKHIdrZWHvR3OE+nGmsWqILVMw1wCC5MLq6Puy+MdEVVQNfKiyT1t6ya0hCkK HEVZPa2AXThZy9HuXbWrnsHLLtpa5kVfU6mRqTst3KzU/OuJvgmVyY5zLUSzD/IxOHUa rZVd1BnBHi+OzBFG1eGaHfwGhgo4Y+0+MnlKGsLWRNZF6xa1GMLonvKQawTY3dXd18Jk 1XM1PPf27wjwlPf9PLYg5chHTN4+zX7eE9wvykV+0w0l8DMqgpsp55rdtkZ6XBMNr/BM LHycmZNel8bd7IZvO8k/M9R+ysDwxyQ2IwgF1N7ShFPAx3+eTZ4rzESSJeJYeM/Qi6QP VSog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vl9Wpi/Syv/6aGqe6I7JLyQ+9QJLPAtQrqCkcLZrp+g=; b=Asr3NMlItZYP1hOEWXbmUQQbKwBxzoCyIA6iAbEG2mPIAXf9bcQ4lujyQ7tFuIkp86 UakrcbXdHdGd8tHLVqAPaKPJQ9Cpr4csWyAj3V3Rk+JDj9qq8JP6ebGZGsXJZrVyOrpa P1pDjX2ecwgbUW6pBCkJ7ddMBke5keLdZylhFuDIbd/rooFGf7ML/ColLIIs4Xy0NAN7 JcDuNVvEGPGG2hL1J9Bl3ZUzI3XvACOnhoFJQN0LxpawaluqKPUaM8fo08taYp/3pPgg RCnuSfBqykNGMqFkO5njs+w/0ezHvhJ//nIDVfUvhyDWq6X+xFKopN0AYyCFKD+InnXk 3vMg== X-Gm-Message-State: APjAAAWjbQ0LP1rc24MNUMg/VZPD7KDb63/IuZelYO7tPFnljyL7uH6L PHmzxFcadXde0VwYHxN+us3z8w== X-Received: by 2002:a17:90a:24e4:: with SMTP id i91mr3425152pje.9.1565098716641; Tue, 06 Aug 2019 06:38:36 -0700 (PDT) Received: from localhost.localdomain ([45.114.72.197]) by smtp.gmail.com with ESMTPSA id l4sm89183984pff.50.2019.08.06.06.38.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Aug 2019 06:38:35 -0700 (PDT) From: Sumit Garg To: keyrings@vger.kernel.org, linux-integrity@vger.kernel.org, linux-crypto@vger.kernel.org, linux-security-module@vger.kernel.org Cc: dhowells@redhat.com, herbert@gondor.apana.org.au, davem@davemloft.net, peterhuewe@gmx.de, jgg@ziepe.ca, jejb@linux.ibm.com, jarkko.sakkinen@linux.intel.com, arnd@arndb.de, gregkh@linuxfoundation.org, zohar@linux.ibm.com, jmorris@namei.org, serge@hallyn.com, casey@schaufler-ca.com, ard.biesheuvel@linaro.org, daniel.thompson@linaro.org, linux-kernel@vger.kernel.org, tee-dev@lists.linaro.org, Sumit Garg Subject: [RFC/RFT v3 1/3] KEYS: trusted: create trusted keys subsystem Date: Tue, 6 Aug 2019 19:07:18 +0530 Message-Id: <1565098640-12536-2-git-send-email-sumit.garg@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1565098640-12536-1-git-send-email-sumit.garg@linaro.org> References: <1565098640-12536-1-git-send-email-sumit.garg@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org Move existing code to trusted keys subsystem. Also, rename files with "tpm" as suffix which provides the underlying implementation. Suggested-by: Jarkko Sakkinen Signed-off-by: Sumit Garg --- crypto/asymmetric_keys/asym_tpm.c | 2 +- include/keys/{trusted.h => trusted_tpm.h} | 4 ++-- security/keys/Makefile | 2 +- security/keys/trusted-keys/Makefile | 6 ++++++ security/keys/{trusted.c => trusted-keys/trusted-tpm.c} | 2 +- 5 files changed, 11 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 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 #include #include -#include +#include #include #include 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 0071298..7d7b108 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..ad34d17 --- /dev/null +++ b/security/keys/trusted-keys/Makefile @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Makefile for trusted keys +# + +obj-$(CONFIG_TRUSTED_KEYS) += 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 9a94672..b7e53a3 100644 --- a/security/keys/trusted.c +++ b/security/keys/trusted-keys/trusted-tpm.c @@ -27,7 +27,7 @@ #include #include -#include +#include static const char hmac_alg[] = "hmac(sha1)"; static const char hash_alg[] = "sha1";