From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B68EAC433F5 for ; Wed, 24 Nov 2021 07:05:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4486A82FC3; Wed, 24 Nov 2021 08:05:18 +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="mZgV83uT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4E37A82FD4; Wed, 24 Nov 2021 08:05:16 +0100 (CET) Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) (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 DDE1282FB0 for ; Wed, 24 Nov 2021 08:05:12 +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=ilias.apalodimas@linaro.org Received: by mail-ed1-x52b.google.com with SMTP id t5so6084754edd.0 for ; Tue, 23 Nov 2021 23:05:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=cC85zeUqGkmsH8OJvy17E31obBknG5PdD3SRL1NOAeM=; b=mZgV83uTEAnM04oJAWs+PicrsRuchHTxFET4OV1ImS3SnoVUXwdXCmZaF6n0MPjmvM 8NjwwNaE9+i2XcbHcA7UhX1UqCSg5Faqo6lp1y/eAV+NeeGK2NZW8MsobgNrmEybUbtq ahjqqsc6k5D80YdEEBVQgldKzVX5P7D6992BKw7rTxaBdsfuX+5wInRcBtBkZj466gNo JOGL1HiLrXQ8JPZFX2JjuuxXHPfPZid7D2EjArHOXklfXLgsGn8jS1xZTLdXh74VTcix 3jk0uYokTGeuBneJ25AU/zXsUlIy8Ea6VfE52afYe5U0QY9rtH+jUlXCapUVaUdZfQTC 428g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=cC85zeUqGkmsH8OJvy17E31obBknG5PdD3SRL1NOAeM=; b=u89AOARNSB5NPar20EwgsiED6GsqYJdy9Z3m+KjBL9xyluUEGuH3VkhTa20tt/6oxW 2Yp96rDdrXF6myvLjhoRGhNCwvnMPQHpk6alzDSTWU7znM1U2Atmmk+RQbhTQBZx2If6 dlKmNS3rvDgpqvsiuGVrzumlY7rynKFnB3J+c7aEmXfSaOn6XkLR+JGMSM53cpToMLma Rbejkv0uGF/Ubba5j77nOvidWX6BMBjg57TnOTRrdOvVhSICGn2m4SgeFPBpF4w9NBr4 jpjgZ3aYnNnaB3dZnIc6fLerSxUQJRXvP3eGorgeOgfUL7kFD5oR17eQb64lNdfZW/Cf MiRw== X-Gm-Message-State: AOAM5334o11PuK1VnLFleYtQNyv+MjtqUTTRdU46LKxcgl6nWJzJ6f4N SZl/fh/aitR0UKUasW4Wcb0OkJM7tj4dWA== X-Google-Smtp-Source: ABdhPJwANrizmxJ4nMQ3eYnOQC99Erpt92aPZBKT5nITWke+rE1XnDHSqp1Dh7BcYI+07gu55C4HTA== X-Received: by 2002:aa7:c9ce:: with SMTP id i14mr21288015edt.300.1637737512540; Tue, 23 Nov 2021 23:05:12 -0800 (PST) Received: from apalos.home (ppp-94-66-220-227.home.otenet.gr. [94.66.220.227]) by smtp.gmail.com with ESMTPSA id i8sm7750164edc.12.2021.11.23.23.05.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Nov 2021 23:05:12 -0800 (PST) Date: Wed, 24 Nov 2021 09:05:09 +0200 From: Ilias Apalodimas To: Ruchika Gupta Cc: u-boot@lists.denx.de, xypron.glpk@gmx.de, agraf@csgraf.de Subject: Re: [v2] [PATCH 2/3] tpm: use more algorithms than sha256 on pcr_read Message-ID: References: <20211123115335.125252-1-ruchika.gupta@linaro.org> <20211123115335.125252-2-ruchika.gupta@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211123115335.125252-2-ruchika.gupta@linaro.org> 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 On Tue, Nov 23, 2021 at 05:23:34PM +0530, Ruchika Gupta wrote: > 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 > --- > 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) > -- > 2.25.1 > Reviewed-by: Ilias Apalodimas