From patchwork Fri Nov 26 11:53:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 519689 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp2166765imj; Fri, 26 Nov 2021 03:53:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJykgLSM+gruTrC9EtVKaoTKRvY+PyElH8pAfyg2Z/JU9JjfrAHSOViOj0EAFr7fWeXwQ188 X-Received: by 2002:a05:6402:4404:: with SMTP id y4mr47051385eda.321.1637927612527; Fri, 26 Nov 2021 03:53:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637927612; cv=none; d=google.com; s=arc-20160816; b=VwwdjQMZ31i01RSJkPwDgHdE/stN1E45zx7b4J2JVKDdZFvfA9smtBhCU08zGqTw2W Ftf+7HdiCtti25YVCvi16YxjSTUBSF1CARyOcuRq1j9vyTxquvvTddL9o/FMQn1qIJ6B 92Zz6ckhK8/5z+Yen3Rjm3BRHzyAI70HxaClKGjw85zlhlrB/l7c+3HJlgZJKf20Raxr JY1ddQjfV5wSb4Y91MpqVwuMjMfdtcB98I2xHVf6Ktmv6F2RTbwwkx4ubjX6IjYig5IF /rlGNaG7SAVGko8bSj3IZ766tnhHgpBH9fwkYvzLX10PfaL5krv+ilbSOGcouWd9SLT6 zrqA== 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=4TcjVKPpVveDA94tH5bQHdtUE9NXstA3TFrOLoItu6Q=; b=z/sDQLROFmWBtTWzLJGXMqhfrsDWtMayiGoYKpj3frF4o17n1xekZFgw32V0mqJqLZ ncVqjgkNZ6NSudPoPjgBGt+fEaoU2ihzO+RIyCpTohwqTBXX1cyi7XELi3Pqe0dlRbEo +T7Rnn+vbhuIerxWFq4Zbm3hb2H7eSyJNcHxHRQSQiSIT3F222Zm45OpSvy5uZr0k9Ln Z9n9t5pcxTvbvMhPIiF1B60QDZXlwGyn7SJ6XiuNdwsKkbwAN6nSqnezNdclaQPTRLtM S6rxgDnAOw6nnM1bQPf4er50+nXoaeFuL+O/QvNjetAsK0YMxAJsM9WyH3BnDnpqwE4f l1VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sBEow9A9; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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. [85.214.62.61]) by mx.google.com with ESMTPS id gb1si11129798ejc.606.2021.11.26.03.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 03:53:32 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sBEow9A9; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 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 2204A83763; Fri, 26 Nov 2021 12:53:31 +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="sBEow9A9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AEC1E83763; Fri, 26 Nov 2021 12:53:21 +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-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) (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 1E1C480F7A for ; Fri, 26 Nov 2021 12:53:15 +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-pf1-x430.google.com with SMTP id 8so8724047pfo.4 for ; Fri, 26 Nov 2021 03:53:15 -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=4TcjVKPpVveDA94tH5bQHdtUE9NXstA3TFrOLoItu6Q=; b=sBEow9A9mTU0wSPkytgvlI+bWxaEYr1D/d3ysPI+DUbzs4+UBWiLSA+8mctk9huLlJ JofbZ6Cbes9EglCqNmt2palSKeem/uVRqVTx4iApK4MQtB/rf/FeBLPTa9c1gHrDgcmE DqwKHi8Ejts0tMLRKNq5LqC9BDTVesFgAmlO0+ueUf7RMUHZKcwmDT6gWuaIRK5HXmbr 6B8oEyN88lD4LWKsWmasCEf71sQgihYmaJwsWNuyq/bos3cZcf31fuvq9g0SzbVQZBLc 9lMvXfNmoAiXKPVP39jChSCB0IAl8dV7ijVZ4bqJFA1I0ouAQeLRTeDrw7Bt+uL40P0i rQyw== 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=4TcjVKPpVveDA94tH5bQHdtUE9NXstA3TFrOLoItu6Q=; b=Jx8f7ooedkDOu8O9Hj+PDljL7exZ8kB2p2FKBIubOMTETflMd0T7jSWkieL4mgm6rh vOGmO5QNztzLem+vskuYJyJ13tas77gPxOX6wwzNYLXIC1sh5+ruC3QwKJfNKnG8isvB LudKBXamSeIj8g0/Yu63nc1ED9UPV8PeSsigUEl6GJazZXGdMY9DG+chTNzH8rN78Myt TG8WSq6BVgkknOj/tOBylTkZG5AI2HRLSUEE3hutgnWJISKxE58VPiuOU85D1Y9oX4uT 56oDaveFzW8gKdTajvTk890ft5+PpyvJ8357189stXQZ52E7IMgxqOANj/4Cvs15Jm2t vBmw== X-Gm-Message-State: AOAM533yMNohFD3iqXXlnO3qunWvX+W2vpueGinxgCdyPd6lXJlxbY3s Ug3qWLyhwWLQN9Ixa3fInoMVj4uuRvM49A== X-Received: by 2002:a05:6a00:1688:b0:4a3:1451:9700 with SMTP id k8-20020a056a00168800b004a314519700mr20503336pfc.28.1637927593087; Fri, 26 Nov 2021 03:53:13 -0800 (PST) Received: from localhost.localdomain ([106.215.91.18]) by smtp.gmail.com with ESMTPSA id l11sm7128774pfu.129.2021.11.26.03.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Nov 2021 03:53:12 -0800 (PST) From: Ruchika Gupta To: u-boot@lists.denx.de, ilias.apalodimas@linaro.org, xypron.glpk@gmx.de, agraf@csgraf.de, masahisa.kojima@linaro.org Cc: Ruchika Gupta Subject: [v7 PATCH 2/3] tpm: use more algorithms than sha256 on pcr_read Date: Fri, 26 Nov 2021 17:23:00 +0530 Message-Id: <20211126115301.1103687-2-ruchika.gupta@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126115301.1103687-1-ruchika.gupta@linaro.org> References: <20211126115301.1103687-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 --- v7: No change v6: No change v5: No change v4: No change v3: No change 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)