From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=michael.d.kinney@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 54FD721DF8098 for ; Wed, 1 Aug 2018 16:29:34 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 01 Aug 2018 16:29:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,433,1526367600"; d="scan'208";a="72579803" Received: from mdkinney-mobl2.amr.corp.intel.com ([10.241.98.38]) by fmsmga002.fm.intel.com with ESMTP; 01 Aug 2018 16:29:34 -0700 From: "Kinney, Michael D" To: edk2-devel@lists.01.org Cc: Star Zeng , Michael D Kinney Date: Wed, 1 Aug 2018 16:29:20 -0700 Message-Id: <20180801232923.18720-21-michael.d.kinney@intel.com> X-Mailer: git-send-email 2.14.2.windows.3 In-Reply-To: <20180801232923.18720-1-michael.d.kinney@intel.com> References: <20180801232923.18720-1-michael.d.kinney@intel.com> Subject: [Patch v6 20/23] FmpDevicePkg FmpDxe: Use local variable to store test key digest size X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 01 Aug 2018 23:29:34 -0000 From: Star Zeng Some static tool reports "the condition in 'if' statement is constant". This patch updates the code to use local variable to store test key digest size. It can pass the static tool's check. Cc: Michael D Kinney Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Michael D Kinney --- FmpDevicePkg/FmpDxe/DetectTestKey.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FmpDevicePkg/FmpDxe/DetectTestKey.c b/FmpDevicePkg/FmpDxe/DetectTestKey.c index 6dedbdfaee..f9b983bb75 100644 --- a/FmpDevicePkg/FmpDxe/DetectTestKey.c +++ b/FmpDevicePkg/FmpDxe/DetectTestKey.c @@ -53,12 +53,14 @@ DetectTestKey ( UINT8 *PublicKeyDataXdrEnd; VOID *HashContext; UINT8 Digest[SHA256_DIGEST_SIZE]; + UINTN TestKeyDigestSize; // // If PcdFmpDeviceTestKeySha256Digest is not exacty SHA256_DIGEST_SIZE bytes, // then skip the test key detection. // - if (PcdGetSize (PcdFmpDeviceTestKeySha256Digest) != SHA256_DIGEST_SIZE) { + TestKeyDigestSize = PcdGetSize (PcdFmpDeviceTestKeySha256Digest); + if (TestKeyDigestSize != SHA256_DIGEST_SIZE) { return; } -- 2.14.2.windows.3