From patchwork Mon Jan 7 02:26:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia Zhang X-Patchwork-Id: 1021140 X-Patchwork-Delegate: petr.vorel@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.alibaba.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Xzn131g3z9sBZ for ; Mon, 7 Jan 2019 13:27:17 +1100 (AEDT) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id A1BC33E62C6 for ; Mon, 7 Jan 2019 03:27:14 +0100 (CET) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-7.smtp.seeweb.it (in-7.smtp.seeweb.it [IPv6:2001:4b78:1:20::7]) by picard.linux.it (Postfix) with ESMTP id 2A7AA3E6274 for ; Mon, 7 Jan 2019 03:27:07 +0100 (CET) Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-7.smtp.seeweb.it (Postfix) with ESMTPS id 1D9FC200C6B for ; Mon, 7 Jan 2019 03:27:03 +0100 (CET) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R131e4; CH=green; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e01353; MF=zhang.jia@linux.alibaba.com; NM=1; PH=DS; RN=5; SR=0; TI=SMTPD_---0THgoDmB_1546827991; Received: from localhost(mailfrom:zhang.jia@linux.alibaba.com fp:SMTPD_---0THgoDmB_1546827991) by smtp.aliyun-inc.com(127.0.0.1); Mon, 07 Jan 2019 10:26:32 +0800 From: Jia Zhang To: zohar@linux.vnet.ibm.com, pvorel@suse.cz Date: Mon, 7 Jan 2019 10:26:25 +0800 Message-Id: <1546827989-43569-3-git-send-email-zhang.jia@linux.alibaba.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1546827989-43569-1-git-send-email-zhang.jia@linux.alibaba.com> References: <1546827989-43569-1-git-send-email-zhang.jia@linux.alibaba.com> X-Virus-Scanned: clamav-milter 0.99.2 at in-7.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.5 required=7.0 tests=ENV_AND_HDR_SPF_MATCH, SPF_PASS,USER_IN_DEF_SPF_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-7.smtp.seeweb.it Cc: linux-integrity@vger.kernel.org, ltp@lists.linux.it Subject: [LTP] [PATCH 2/6] ima/ima_boot_aggregate: Don't hard code the length of sha1 hash X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Instead, use SHA_DIGEST_LENGTH. Signed-off-by: Jia Zhang Reviewed-by: Mimi Zohar --- testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c b/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c index d85d222..67be6a7 100644 --- a/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c +++ b/testcases/kernel/security/integrity/ima/src/ima_boot_aggregate.c @@ -42,7 +42,7 @@ static void display_sha1_digest(unsigned char *pcr) { int i; - for (i = 0; i < 20; i++) + for (i = 0; i < SHA_DIGEST_LENGTH; i++) printf("%02x", *(pcr + i) & 0xff); printf("\n"); } @@ -94,8 +94,9 @@ int main(int argc, char *argv[]) display_sha1_digest(event.header.digest); } SHA1_Init(&c); - SHA1_Update(&c, pcr[event.header.pcr].digest, 20); - SHA1_Update(&c, event.header.digest, 20); + SHA1_Update(&c, pcr[event.header.pcr].digest, + SHA_DIGEST_LENGTH); + SHA1_Update(&c, event.header.digest, SHA_DIGEST_LENGTH); SHA1_Final(pcr[event.header.pcr].digest, &c); #if MAX_EVENT_DATA_SIZE < USHRT_MAX if (event.header.len > MAX_EVENT_DATA_SIZE) { @@ -116,7 +117,7 @@ int main(int argc, char *argv[]) printf("PCR-%2.2x: ", i); display_sha1_digest(pcr[i].digest); } - SHA1_Update(&c, pcr[i].digest, 20); + SHA1_Update(&c, pcr[i].digest, SHA_DIGEST_LENGTH); } SHA1_Final(boot_aggregate, &c);