From patchwork Fri Nov 26 05:00:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 519686 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp1833260imj; Thu, 25 Nov 2021 21:01:28 -0800 (PST) X-Google-Smtp-Source: ABdhPJy7WN9mYwHLF7h8YvaIfpuDsUtfwa2HuRGeRVEKHOj2vCi+5Q8s6gCFnVUUQCeUD4wg8B2W X-Received: by 2002:a17:907:2bd1:: with SMTP id gv17mr35753844ejc.231.1637902888546; Thu, 25 Nov 2021 21:01:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637902888; cv=none; d=google.com; s=arc-20160816; b=ojKwsN0SeJnefLp49bb4HyDmdCSfSuNNQDkeD/XBT9RHx1FGJhmOQFKI43ae30O5u/ rmIosfiWPU/jQZR7s+lByMqEkbLEWvo0Cad2fx+pO/s1o8hAoSvlaOlmOyR+LZiM8grY KfsdTGR1buQC/hZYbtjDG6APFohITZeNBONfZTmnhXVaw+7xmoUP/O9nukaw6aa5P7P+ YNsMCT4lyx3OeUVUW4cYgxESm7pKEKEiO3yRLwCnriPp/YBOSaE0Pf//gglU+NYz+O8C +Jegg2EFsiQTDakTN7FUfbrMuDjGT1CLL2v6niePbSgwMHHoOQh+PLgDa8aShaenrpdY ib5w== 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=QAiyNOT5ZzsWbZKmMKwVVu8oCIOdAQZ1QR/hJ/4wC2I=; b=w6Z8b/ub4SYK3ZaWEwioNQWwu8JyglDJzUP45YmawvnmOkaciGT/c1RukfZp3hCjC7 lnjgQkk4Wx3BP4UaiyEt/o2rdwrnJY5fPTB93Tc1sF5F6ozpR2eiA2S2VRPsjDywPJNR MPxAp/glWIjM8YganDjeKfqmYFSxnRn5nr+uYw0JuSU89PCby/mSzxlnPkbscydMOhwc JBV6r7PNZcCMYeFe1VzDD+a8+yiXfn3bZI/A+dc2zsMwhbRcfYSjKpLLKhiNawfn7ste 8hRbo7XKmKGgPySxwFO3pnwJAWYQMjVNVo94gjJ2IOVuojiPMs45/LhPoT8vaDRzNItw qY/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xhjXbDm3; 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 b25si8845934ejd.105.2021.11.25.21.01.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 21:01:28 -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=xhjXbDm3; 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 6E33F8365E; Fri, 26 Nov 2021 06:01:19 +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="xhjXbDm3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4AAB080EFB; Fri, 26 Nov 2021 06:01:12 +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 2597B83257 for ; Fri, 26 Nov 2021 06:01:09 +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 r130so7802263pfc.1 for ; Thu, 25 Nov 2021 21:01:09 -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=QAiyNOT5ZzsWbZKmMKwVVu8oCIOdAQZ1QR/hJ/4wC2I=; b=xhjXbDm31zUzDeDJ7eM7jMqLPGDYI7nLZs8zNSHjMtbuatGd3VOvn4QYrX2WXuohke xacSxBLK1y0aSYbUoOwpJeQeCDRDwyNCePWR8n890v80HA5Egnw4v20e05aPlyVRrAUp P67oFnDRMEDCPXsq42Crf0ZKvPdHhgJ66lnwOfRFlLvwfXo0XFa6eP2WgokZlhukj9j/ YTbU8ul+cFPe4LkMpy+dWSc0oem7RJSDDTlasmzcdw7fiaGR6m0xg0FYYSSpLR1n7Grb swsaHrbGJtsyyxLo5txkYJnzXruWUuDTZAv7bUhSrYmZGF2jeYSYNCu1LPcV6mEhRtSs I/sQ== 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=QAiyNOT5ZzsWbZKmMKwVVu8oCIOdAQZ1QR/hJ/4wC2I=; b=0F6dTfNTif8XPYhyA3y60WxYK3N2wUnc9w1lAURHSXXhtFCPUP0Vv4D18EouSbPQOW 3QgEk65azvn84pRtsWJVRuxlWdFwvwVyFLS9x7oMJHWQK8LT4cVqTawv3dt2HiGXV0ly RBErkVil08mI1g1R6dbbIyDYxd5wdQ/xIcspzaTfkkMwSyARaCX8Vp3SCna62DkTIha7 AxrxUKQp9C3FddUE0i1rVP9N2U/cp5msYvXL4Lk3CcMTHMikwZGQpdRImIz79LA89h9A Ye1UEIFgfUpGMnjZefY5q775/lZtJYvZ6TALYyEBB4Vw/arodjdkCE6WJftyhAZVBFzK zlXA== X-Gm-Message-State: AOAM532ni2YCxdghpAGtxzP3uQRnaQjWaaqa5rG0/U2NT9oHKnPSd+NO vnpf/5VnwS0JiMFn8b02rlc+V24peKpzig== X-Received: by 2002:a63:8749:: with SMTP id i70mr12255652pge.19.1637902867322; Thu, 25 Nov 2021 21:01:07 -0800 (PST) Received: from localhost.localdomain ([106.215.91.18]) by smtp.gmail.com with ESMTPSA id s7sm4904405pfm.188.2021.11.25.21.01.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Nov 2021 21:01:07 -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 v6 2/3] tpm: use more algorithms than sha256 on pcr_read Date: Fri, 26 Nov 2021 10:30:54 +0530 Message-Id: <20211126050055.765911-2-ruchika.gupta@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211126050055.765911-1-ruchika.gupta@linaro.org> References: <20211126050055.765911-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 --- 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)