From patchwork Tue Dec 8 08:10:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7795521 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EE652BEEE1 for ; Tue, 8 Dec 2015 08:11:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0BC0A204EB for ; Tue, 8 Dec 2015 08:11:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1D67620376 for ; Tue, 8 Dec 2015 08:11:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933225AbbLHILP (ORCPT ); Tue, 8 Dec 2015 03:11:15 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:33470 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933166AbbLHILM (ORCPT ); Tue, 8 Dec 2015 03:11:12 -0500 Received: by wmec201 with SMTP id c201so200865861wme.0; Tue, 08 Dec 2015 00:11:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ydOh49vPp0RxZ6t9iDdXH76sgXl2UWJInlTrjCBI6Nk=; b=mxXO+q9chMJwvlbAEh4KzykEl+TstdsGT1xY8Ki5iMsno1MFvGclIs3wS1wLCYAXTz muka9YP2cHIWHpvbnnkmnUEL2er/zYNzEwUNohOtzuSRVPVqf0Ge1p5VN7fdllX34P+Y tlITMJ6gkr+GGLBbK+Lm9LfQSZrl3t5pYuGQH5Vl7ePc72mZvb+n76TZKkNzxs7V4gvR DTegIEZSd0IpXMIrQngs+JwoIwycOzjKO9PHjUU6V7euaFXJQigH+7mgtPmOrUBZj5aZ 9J6Vbj3XZcTzcPtQSQe9J5x7gqjztVTuJmtX+O3FNZo2/um4LY2qU3nRW7aPUzqk8tGc tNEQ== X-Received: by 10.194.19.100 with SMTP id d4mr2279322wje.18.1449562271380; Tue, 08 Dec 2015 00:11:11 -0800 (PST) Received: from Red.local (ANice-651-1-254-254.w86-205.abo.wanadoo.fr. [86.205.38.254]) by smtp.googlemail.com with ESMTPSA id k125sm2290733wmf.2.2015.12.08.00.11.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 08 Dec 2015 00:11:10 -0800 (PST) From: LABBE Corentin To: clabbe.montjoie@gmail.com, davem@davemloft.net, geert+renesas@glider.be, herbert@gondor.apana.org.au, luis@debethencourt.com, maxime.ripard@free-electrons.com, vinod.koul@intel.com Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/4] crypto: ux500: Use precalculated hash from headers Date: Tue, 8 Dec 2015 09:10:53 +0100 Message-Id: <1449562253-13846-5-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1449562253-13846-1-git-send-email-clabbe.montjoie@gmail.com> References: <1449562253-13846-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Precalculated hash for empty message are now present in hash headers. This patch just use them. Signed-off-by: LABBE Corentin --- drivers/crypto/ux500/hash/hash_core.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c index f47d112..d6fdc58 100644 --- a/drivers/crypto/ux500/hash/hash_core.c +++ b/drivers/crypto/ux500/hash/hash_core.c @@ -41,22 +41,6 @@ static int hash_mode; module_param(hash_mode, int, 0); MODULE_PARM_DESC(hash_mode, "CPU or DMA mode. CPU = 0 (default), DMA = 1"); -/** - * Pre-calculated empty message digests. - */ -static const u8 zero_message_hash_sha1[SHA1_DIGEST_SIZE] = { - 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, - 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, - 0xaf, 0xd8, 0x07, 0x09 -}; - -static const u8 zero_message_hash_sha256[SHA256_DIGEST_SIZE] = { - 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, - 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, - 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, - 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55 -}; - /* HMAC-SHA1, no key */ static const u8 zero_message_hmac_sha1[SHA1_DIGEST_SIZE] = { 0xfb, 0xdb, 0x1d, 0x1b, 0x18, 0xaa, 0x6c, 0x08, @@ -242,13 +226,13 @@ static int get_empty_message_digest( if (HASH_OPER_MODE_HASH == ctx->config.oper_mode) { if (HASH_ALGO_SHA1 == ctx->config.algorithm) { - memcpy(zero_hash, &zero_message_hash_sha1[0], + memcpy(zero_hash, &sha1_zero_message_hash[0], SHA1_DIGEST_SIZE); *zero_hash_size = SHA1_DIGEST_SIZE; *zero_digest = true; } else if (HASH_ALGO_SHA256 == ctx->config.algorithm) { - memcpy(zero_hash, &zero_message_hash_sha256[0], + memcpy(zero_hash, &sha256_zero_message_hash[0], SHA256_DIGEST_SIZE); *zero_hash_size = SHA256_DIGEST_SIZE; *zero_digest = true;