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 X-Spam-Level: X-Spam-Status: No, score=-19.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EE7F1C432BE for ; Mon, 2 Aug 2021 13:20:29 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 5B15161108 for ; Mon, 2 Aug 2021 13:20:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5B15161108 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 39BDD833EA; Mon, 2 Aug 2021 15:20:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.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=kernel.org header.i=@kernel.org header.b="Ddw6Pnsx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5D96B833F5; Mon, 2 Aug 2021 15:19:59 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 9E1AC82BCE for ; Mon, 2 Aug 2021 15:19:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=pali@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id BE2E160FC1; Mon, 2 Aug 2021 13:19:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1627910388; bh=9NidyAawMuu4fCRM6qgBZ3NiE+6yg1BbCp66dGaJZsA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ddw6Pnsx4H1ZpMLG47On3b0CAnePFA2KZsjvGE5N2UBLO/vK6SLYcApJAE2qNp8Eu 23V4kxWMDqDCTFPF0JDoEa2Ws9krbJKozvs8PWi06SBUsGB8COdoIr+IKZSRnkIFY3 hh6A8ziEF7FGSwwsIC0mK13W/il8mv/+qn+ED4TIZFJuZAsm3UkzWHyTGmTBZYe8JG VAVnvNJf2XzYjNnPee1h7nT3J4OM5ZZ/bTO9umdHglsDqFshRPhuR5aXy5CUV0/jB0 B5WRSCA4F/rmXQqTN6A9HHhFDBZDSUhmHwmwQCLqpZOHp82q3jjOshGal9uUbB5p7R RgheRlOai7R0w== Received: by pali.im (Postfix) id 7EED8B98; Mon, 2 Aug 2021 15:19:48 +0200 (CEST) From: =?UTF-8?q?Pali=20Roh=C3=A1r?= To: Simon Glass , Heinrich Schuchardt , Alexander Graf , Huan Wang , Angelo Dureghello , Wolfgang Denk , Priyanka Jain , Christophe Leroy , Bin Meng , =?UTF-8?q?Marek=20Beh=C3=BAn?= , Tom Rini Cc: u-boot@lists.denx.de Subject: [PATCH 03/11] efi_loader: Use directly version_string variable Date: Mon, 2 Aug 2021 15:18:30 +0200 Message-Id: <20210802131838.21097-4-pali@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210802131838.21097-1-pali@kernel.org> References: <20210802131838.21097-1-pali@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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 Macro U_BOOT_VERSION_STRING is already stored in variable version_string. So use directly this variable instead of storing U_BOOT_VERSION_STRING into temporary variable. Signed-off-by: Pali Rohár --- lib/efi_loader/efi_tcg2.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_tcg2.c b/lib/efi_loader/efi_tcg2.c index 1319a8b37868..14353ae71c9b 100644 --- a/lib/efi_loader/efi_tcg2.c +++ b/lib/efi_loader/efi_tcg2.c @@ -1275,11 +1275,10 @@ free_pool: static efi_status_t efi_append_scrtm_version(struct udevice *dev) { struct tpml_digest_values digest_list; - u8 ver[] = U_BOOT_VERSION_STRING; const int pcr_index = 0; efi_status_t ret; - ret = tcg2_create_digest(ver, sizeof(ver), &digest_list); + ret = tcg2_create_digest(version_string, strlen(version_string) + 1, &digest_list); if (ret != EFI_SUCCESS) goto out; @@ -1288,7 +1287,7 @@ static efi_status_t efi_append_scrtm_version(struct udevice *dev) goto out; ret = tcg2_agile_log_append(pcr_index, EV_S_CRTM_VERSION, &digest_list, - sizeof(ver), ver); + strlen(version_string) + 1, version_string); out: return ret; -- 2.20.1