From patchwork Wed Nov 24 07:56:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ruchika Gupta X-Patchwork-Id: 519345 Delivered-To: patch@linaro.org Received: by 2002:ac0:c605:0:0:0:0:0 with SMTP id p5csp9968289imj; Tue, 23 Nov 2021 23:57:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsrbI0vkare280dQCJNWRC9f6j/Pyq25GDc9Pjhp++ezf4DGDlkSYfcvIkrCv7xkfKFUM9 X-Received: by 2002:a17:906:31c2:: with SMTP id f2mr17320229ejf.341.1637740621369; Tue, 23 Nov 2021 23:57:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637740621; cv=none; d=google.com; s=arc-20160816; b=iaMFhePIRxYMmcA9+PT12Vy0KY7O+TRY1HnbmA6uUaEAz/NXWLxCDIj1yXBjWsziAd 280dAtA2IdpxnB4QxpNvEwO4Lwtvlvz0MgLFd0e8KuHOKPeb1HABq+pwFySIwKePG5Qv BLUqE9Ybns8odiJkRbEPgP1iUzFSTFETPvD4Bxn+K+OhIXOz1pmcYIi7NSCbEua7zZRC WAJzQC/wTUluGB/Qiyas1PhfWbeXPv8jlge5M6MfJMCMSDC52KtnuKmsfaq49UaU/GXN cvzCnzDYwD2xZ/jhOWFTQW6ZG6Bl5hIzRp6u8kRkOw61txQxD08Gg9sZPBj2fbCdvKs1 J3zg== 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=CENfc8gSIOvN1khuUO8kQjgl1eL7mjb4JvMs2DCmxkc=; b=oNgOmw+Gh82iL/4c0/as2fSoMGukzLf5WW1JDNj6jREKKjIeAvFzNfZrEw6D9gE+4f W5nZLwKwbLX69TW8O3H3gVMsRNl/Sf1sA3R6ZrY00U0RZkJvFyPspGG6b1Y3lF2TJy6Q DUgeOABxbIDHm2VtDDjC7kFbE4ZTKRd1xmBSqf3tEgrg6epXn0kFeL1E3k2vBAF63xxP cM+r7qtS7+YurvnpD859RPglpB8zCHKTvXPmMAMVAMHBmPZHzfQ96TJkCXM2L0o6WH43 SfsD2GjPKkXJ1R0ick+RQkihEC734ClSkNfNlTikRHWgJxcoMVRkpURcoNrWAR6voRY6 saiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jbOi9yZX; 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 qf24si45508954ejc.251.2021.11.23.23.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 23:57:01 -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=jbOi9yZX; 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 1769283731; Wed, 24 Nov 2021 08:57:00 +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="jbOi9yZX"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6EE5583731; Wed, 24 Nov 2021 08:56:57 +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-x62d.google.com (mail-pl1-x62d.google.com [IPv6:2607:f8b0:4864:20::62d]) (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 9EDB783737 for ; Wed, 24 Nov 2021 08:56: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-pl1-x62d.google.com with SMTP id v19so1171732plo.7 for ; Tue, 23 Nov 2021 23:56: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=CENfc8gSIOvN1khuUO8kQjgl1eL7mjb4JvMs2DCmxkc=; b=jbOi9yZXAOYCHM4mslJ6lBwBZU1CALRis4xjshwa8f2HUb9m1nGEnDjsZjHMORmMry te4Nj7H69iruf3C40lPqhLe9M0ZEuHy4rrAFeqf/RIzP0B6xc2mk7Yc4Gmx02yD2YhNb 36UKVACmgG8VdadJbW6C3Bo2o9b5O+uHx/E1QPNgRXq309qyHhKb6GLSyUwTUmL0CMQ/ Q6KIPKNLymdb8JeYOwN+RrTwHcdya/3ihXKlMQmDcUMSm5JTfzGGn6fEihmO001lhk/9 LuN8VjaNfPjGbMKRjX1t6lJ2Nj2UvfD2yTWcRiEdrayFkeW0VQWG5JL0YSTy8QfKW3Nt wKeg== 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=CENfc8gSIOvN1khuUO8kQjgl1eL7mjb4JvMs2DCmxkc=; b=MbkdZ2ZavaZZ+50shtOu5YmZ3LBEFflxJ5/YDxK6ucs16TheiAHTRSBUepMtbpTTB6 E0X23eZowys6Pk0iZm0frqbcs5L5kfL7wK6gmpxvb0SmgqtcujCRzuv7upu4RF4jrc43 G72ZS2bjisU7K9WjdcDk59F/PZIPJN33nZSCPhly7WhCSCSTYP2qalEqsRjKJg7R+twF XbxqtU6Yo/zjz9rahJJTuIrYx8cEUt895lz6+wvrP4Gsc5JMvDvaaRn5OuAHrsvgoT/V tS8r2xufcnMK60q90uLunYF9aj3ylfAfga+WAo5tljRD5Oy+74n6t4q9Ggjg2qRDcIN+ DfUQ== X-Gm-Message-State: AOAM531SuGV2/q45AbZ8piAibLo1FDqUP8hM4ka99bsc1q1+66jhC3RD EEcA8K8NAp/2n/8+rWnUcvdYRvsMybeR7Q== X-Received: by 2002:a17:902:8302:b0:142:66e7:ed6d with SMTP id bd2-20020a170902830200b0014266e7ed6dmr15953133plb.83.1637740609578; Tue, 23 Nov 2021 23:56:49 -0800 (PST) Received: from localhost.localdomain ([106.215.91.18]) by smtp.gmail.com with ESMTPSA id q9sm10775420pfj.114.2021.11.23.23.56.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 23:56: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: [v3][PATCH 2/3] tpm: use more algorithms than sha256 on pcr_read Date: Wed, 24 Nov 2021 13:26:24 +0530 Message-Id: <20211124075625.197449-2-ruchika.gupta@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211124075625.197449-1-ruchika.gupta@linaro.org> References: <20211124075625.197449-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 --- 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)