From patchwork Wed Nov 24 15:08:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 519352 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp10529195imj; Wed, 24 Nov 2021 07:09:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJyImErtmSwy7x27zmhzXWIwcG7+VzR3IJwmvEJOj0g53TzAvBvK7SRac/b/XY4BJ21LU+8y X-Received: by 2002:a17:907:7294:: with SMTP id dt20mr21167582ejc.321.1637766590602; Wed, 24 Nov 2021 07:09:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637766590; cv=none; d=google.com; s=arc-20160816; b=ecjUxDM4d8fzmbBxEGlPUecn3IEeCjzoRfB1dYfA4AmCxR7JHXGxDbh655ztkSDGJj DTgEFnB4gwr8mtMKSi8oX8scy9cEnyJusZuWDuI30aUPmX62AxKcppl+fgRwVroQHu1P pYw5owznzWNCtZldYMWAhB8+hITt00swuY0fm3yxASJ9hYJUk6P9U+8eu1WHD/9vaG6c jjgwcd0AON3zuDD4hScuNbXJhocp9a4P6hahjn3IDcFvgQU7w6EPynREHPRqe4aYSsiF x3C4Ps/qrZYDc30f7ijBn1h3QA8UYvr7Ad+L2jdnmQn0bU4abtmao4O8XR3XL4Ysrd3Q koyQ== 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=7hpHJ4VcDsvw8pbnUM8NzFpxQqGHjRB1yoXbjdxNuNE=; b=tOlGucdxnJtYlmVQDYIA4EYt/xrWEMzbFe/BLMHGNsaMWYaUihlwUr0PjsBYAX008u xZVYi9pYEBVIkzODDICvQzb6LYRuav4jtSCDf80VwyZDfCGa9NdiD6KQ+v4qsvA0W7i5 KeDljoeMRh6Ctg5aQEFQ7/YhkMizGFPSqmi3O9j1lHxJoB/6wFdhC38rb9WRMEctYLa/ KAtSpqPLOEnoxsj8M6F6KK5GmtoBK3LVeolkXoS3TBZMmqeWbrYWk6Cems3o1wtKkCq+ GsN6onISPNp8wvJ2Sowe7P81cFHLV5NTM2mD+dElXcXyT25slbH0rgAclsmdrER/iHSE FHvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ECWx3fQy; 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 d2si271321edm.64.2021.11.24.07.09.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 07:09:50 -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=ECWx3fQy; 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 4151F82FA8; Wed, 24 Nov 2021 16:09:42 +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="ECWx3fQy"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D4C4C82FC9; Wed, 24 Nov 2021 16:09:25 +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-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (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 5EAC682FA8 for ; Wed, 24 Nov 2021 16:09:14 +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-pl1-x62f.google.com with SMTP id y8so2107057plg.1 for ; Wed, 24 Nov 2021 07:09:14 -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=7hpHJ4VcDsvw8pbnUM8NzFpxQqGHjRB1yoXbjdxNuNE=; b=ECWx3fQyCuSVhDwniy0o2AMNKX/Pmif/EO8ao1XoWrczjy9A1I+lj1zYsTmrZmYRcC AYsJxV/lXaf/u4Ljc1LGp3YIYc1lUV8YTFguAJhynJCIeEFaIZfKJjDXCu/6SQrGbS4k 6c/vg9eobjQDSpuo9oJEmTRaI7vIfds+bbGzFeJAmURcRZ1QSvPAc9WagVWHAyWq8ENA Zdk/FF03lQ/f0t4yS9pWL82TOUbQEq/DlrmTz5E38O1xR+gaL9MQwE2u3grx4l8yXZ64 vqAkEsnKAcJ6j5GKgIMejFBlut1w2yAXXgWS455/0oL/JpCkj3u7eceWcE5mM12NtTxe ntZg== 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=7hpHJ4VcDsvw8pbnUM8NzFpxQqGHjRB1yoXbjdxNuNE=; b=lSxL298U6E5sSTXy1eE8JeaDwh1OMN1TfOg8yTkUVMOleuyJNZwO+/uLwnVHIcZJxF FpnpaPP9g52oTxPTPQYbU3V8EkVbrsivM6JzitcglTlCcNVJYn+h3j83/AKk9Vs7Rptq 0JkYRj+MSew4X4UIsD+ajyYLeAvH8+kWtczb1gxLpOFqEALcB1U9RayaSgYjVAQaz1ul M2LFh7LJ1Q7XsS8l4wBILtD2szL33XJJp4c+gcdETV9uThsAmlMY+ciZubs65XLcc186 +/hmMwDmmS+8Ga8NDM5+Ftdohmzw0Yk+CTIpS8zwgRvTVracmOiWOPxVHWSl20vDp8GO jpkw== X-Gm-Message-State: AOAM531nXkYda1gzr8Hl9sBDd1tJjaIRSxltRypsttwgF1wZuKuIHZp9 DpLooePSTUMybCTjaP1xFQJyxHto3M/oGw== X-Received: by 2002:a17:90a:db02:: with SMTP id g2mr16552399pjv.76.1637766552204; Wed, 24 Nov 2021 07:09:12 -0800 (PST) Received: from localhost.localdomain ([106.215.91.18]) by smtp.gmail.com with ESMTPSA id t67sm60967pfd.24.2021.11.24.07.09.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Nov 2021 07:09:11 -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: [PATCH v5 2/3] tpm: use more algorithms than sha256 on pcr_read Date: Wed, 24 Nov 2021 20:38:57 +0530 Message-Id: <20211124150858.496805-2-ruchika.gupta@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211124150858.496805-1-ruchika.gupta@linaro.org> References: <20211124150858.496805-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 --- 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)