From patchwork Tue Nov 23 11:53:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 519314 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp8505444imj; Tue, 23 Nov 2021 03:54:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJw84yxKoHPBIq12s+iQKCREQQ/9r01hwWaB5x0YJ6z3ptlTvU+bVG0zjR9iO+PYoOpUosoy X-Received: by 2002:a17:906:7ccf:: with SMTP id h15mr6851145ejp.386.1637668441510; Tue, 23 Nov 2021 03:54:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637668441; cv=none; d=google.com; s=arc-20160816; b=HJHFgLmde/GxptWWCT8+L4ImFrgbNl5aYMm8kXr33nxnShSWMCkasAV/pzUTYq1ijY fni0IqJtAzBsAsDklBUvFu+1Ou+zWsJUz+L3bkkIKzE+09HEOYcddkOnaFt2B0G9YCpx +93+HXTvPfoATnmgfIQKsAemE43rvEtGZGwfpXO1GgFD4lLg/gb5R+qvOrRUxotBDtDg rTp0mGT6RVSWlBiDrXmeVCYrkvh3wCiHJI7VRtpJ+F4OQCVBPJi179GrsdS+WDofjhfG 5E8tlRIYYW1wfDHUQxfR5ZeBxv/ugIg/BYp1gN54fpHGkCzt0kboNdn6tNZG3vS8uQRu VznQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Bff2wf29QQNRVoQJkjSfdwfzFPR/ux7Xoyrtoc3m6uo=; b=hKWOmAmjyIrg4qJ7oB8Rf2Bv4b72b3RRRpNo5rdkgS05SRiVXZt4Nrhf4gsZr7gH3q /11hop5STTJPuuRyjgdtDKB8vYBrGvbOKYJDg2gjbFuG3grKCA99+KW/0NqMs6hXiH6j bOmLjV/ixjD7zxCRrglaVxHBj/e71UpcYPCduLTRRTo0bHVH3pnG45aJzMbbUwVPoCGi vfI9EyL6dNTF3Q8RO9NNQN/b89B1rVev4he/K5l/XMqorVrUMRC+X3SJxBwzsFTrdY47 ItQE9ZhCbZYCa7W1xvRxTbMs+M+TIJOjqp6FqvMGc5Pr0BUKGuJ5jXuUl8+Yz9645OX6 c21Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZIbnryap; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id fy18si23404812ejb.297.2021.11.23.03.54.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 03:54:01 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZIbnryap; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22C8883720; Tue, 23 Nov 2021 12:53:58 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="ZIbnryap"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BA73C83691; Tue, 23 Nov 2021 12:53:55 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E2397836C5 for ; Tue, 23 Nov 2021 12:53:51 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=ruchika.gupta@linaro.org Received: by mail-pj1-x102a.google.com with SMTP id w33-20020a17090a6ba400b001a722a06212so2011955pjj.0 for ; Tue, 23 Nov 2021 03:53:51 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=Bff2wf29QQNRVoQJkjSfdwfzFPR/ux7Xoyrtoc3m6uo=; b=ZIbnryap2HRCsbQlR2/bE2onVHMqd9eO4JLlZe2SekCgkNXSaqiKWpel0G4s04Au3P +lYYxx9IsCX1UAjOB14B5n5+HXhJ3c0A7aJXjzOhF3Ixl8Xk/nLO9Y1T6AN6j2n+1RKP S0jI60zTldxxYlj50V307rLWZZ/L2OBCXBouqOmWTVZdP8YdjGzTas0mG9SezasBMxzs lJlOi6DkyicT1zuP4RaIebSooGNF7mYsSPtHd0IJluQc4kOwv95HXbuXq4TuASVCKnly mi/gLbxigEcbs5bfBJxIPER/cnQanW18TxutSfQttWKc/QaGbsKw+1u5sPJVXY0DZBw5 7iNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Bff2wf29QQNRVoQJkjSfdwfzFPR/ux7Xoyrtoc3m6uo=; b=NxOy/gfCih0wdPeUa5cEj3KHSKGQ3dQTI8uKYSiOsEWsUVz4To0ZyAJaY57njUIzex JQ7z7gm8rH/+On4wO07d4acEhupzXd9UcMzhABUlZd7rlOQ/P3gdtDB48iZ2xoogqhv7 93WC/0I/WlseLLGw7r+xWKVSc0hNdSDYgBZIkgENMuvn6ks/bdAo2Ja4w5r46QHIV255 hkw3SEZp8BNTh1SxCeY164tWkjTpfj9lPEjv6TZnzZ7WVrnHyXWIPqNFv0pCE/tsqsmh ybtsdVoSf94raBGyz3LkbZpUejqMTHISAAQhaxsdcf2OzBRwO5Juqya77E+mUB6LJPS4 IAVA== X-Gm-Message-State: AOAM5308d6xdEW/dal22ANigihfRkgUW8qMFrGFPehlyL8NpBZU+P3f3 8ZY80aV1DyheVgDq4K7Q4IOhWMe4wsSk1A== X-Received: by 2002:a17:902:d703:b0:144:e012:d550 with SMTP id w3-20020a170902d70300b00144e012d550mr5512592ply.38.1637668429958; Tue, 23 Nov 2021 03:53:49 -0800 (PST) Received: from localhost.localdomain ([106.215.91.146]) by smtp.gmail.com with ESMTPSA id x6sm1115203pga.14.2021.11.23.03.53.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 03:53:49 -0800 (PST) From: Ruchika Gupta To: u-boot@lists.denx.de, ilias.apalodimas@linaro.org, xypron.glpk@gmx.de, agraf@csgraf.de Cc: Ruchika Gupta Subject: [v2] [PATCH 2/3] tpm: use more algorithms than sha256 on pcr_read Date: Tue, 23 Nov 2021 17:23:34 +0530 Message-Id: <20211123115335.125252-2-ruchika.gupta@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211123115335.125252-1-ruchika.gupta@linaro.org> References: <20211123115335.125252-1-ruchika.gupta@linaro.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.37 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean The current tpm2_pcr_read is hardcoded using SHA256. Make the actual command to TPM configurable to use wider range of algorithms. The current command line is kept as is i.e limited to SHA-256 only. Signed-off-by: Ruchika Gupta Reviewed-by: Ilias Apalodimas Reviewed-by: Ilias Apalodimas --- v2: Change algorithm from u32 to u16 Add parameter description in function declaration cmd/tpm-v2.c | 3 ++- include/tpm-v2.h | 5 ++++- lib/tpm-v2.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/tpm-v2.c b/cmd/tpm-v2.c index daae91100a..4ea5f9f094 100644 --- a/cmd/tpm-v2.c +++ b/cmd/tpm-v2.c @@ -151,7 +151,8 @@ static int do_tpm_pcr_read(struct cmd_tbl *cmdtp, int flag, int argc, data = map_sysmem(simple_strtoul(argv[2], NULL, 0), 0); - rc = tpm2_pcr_read(dev, index, priv->pcr_select_min, data, &updates); + rc = tpm2_pcr_read(dev, index, priv->pcr_select_min, TPM2_ALG_SHA256, + data, TPM2_DIGEST_LEN, &updates); if (!rc) { printf("PCR #%u content (%u known updates):\n", index, updates); print_byte_string(data, TPM2_DIGEST_LEN); diff --git a/include/tpm-v2.h b/include/tpm-v2.h index ceff7d245e..4e9dd52cb6 100644 --- a/include/tpm-v2.h +++ b/include/tpm-v2.h @@ -512,13 +512,16 @@ u32 tpm2_nv_write_value(struct udevice *dev, u32 index, const void *data, * @dev TPM device * @idx Index of the PCR * @idx_min_sz Minimum size in bytes of the pcrSelect array + * @algorithm Algorithm used, defined in 'enum tpm2_algorithms' * @data Output buffer for contents of the named PCR + * @digest_len len of the data * @updates Optional out parameter: number of updates for this PCR * * @return code of the operation */ u32 tpm2_pcr_read(struct udevice *dev, u32 idx, unsigned int idx_min_sz, - void *data, unsigned int *updates); + u16 algorithm, void *data, u32 digest_len, + unsigned int *updates); /** * Issue a TPM2_GetCapability command. This implementation is limited diff --git a/lib/tpm-v2.c b/lib/tpm-v2.c index 2e7b27bd6b..1bf627853a 100644 --- a/lib/tpm-v2.c +++ b/lib/tpm-v2.c @@ -254,7 +254,8 @@ u32 tpm2_nv_write_value(struct udevice *dev, u32 index, const void *data, } u32 tpm2_pcr_read(struct udevice *dev, u32 idx, unsigned int idx_min_sz, - void *data, unsigned int *updates) + u16 algorithm, void *data, u32 digest_len, + unsigned int *updates) { u8 idx_array_sz = max(idx_min_sz, DIV_ROUND_UP(idx, 8)); u8 command_v2[COMMAND_BUFFER_SIZE] = { @@ -264,7 +265,7 @@ u32 tpm2_pcr_read(struct udevice *dev, u32 idx, unsigned int idx_min_sz, /* TPML_PCR_SELECTION */ tpm_u32(1), /* Number of selections */ - tpm_u16(TPM2_ALG_SHA256), /* Algorithm of the hash */ + tpm_u16(algorithm), /* Algorithm of the hash */ idx_array_sz, /* Array size for selection */ /* bitmap(idx) Selected PCR bitmap */ }; @@ -283,10 +284,13 @@ u32 tpm2_pcr_read(struct udevice *dev, u32 idx, unsigned int idx_min_sz, if (ret) return ret; + if (digest_len > response_len) + return TPM_LIB_ERROR; + if (unpack_byte_string(response, response_len, "ds", 10, &counter, - response_len - TPM2_DIGEST_LEN, data, - TPM2_DIGEST_LEN)) + response_len - digest_len, data, + digest_len)) return TPM_LIB_ERROR; if (updates)