From patchwork Tue Dec 15 13:00:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 7854361 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 121C69F349 for ; Tue, 15 Dec 2015 13:01:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6944F20304 for ; Tue, 15 Dec 2015 13:01:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9E8AF2037F for ; Tue, 15 Dec 2015 13:01:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933096AbbLONAv (ORCPT ); Tue, 15 Dec 2015 08:00:51 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:36519 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933272AbbLONAu (ORCPT ); Tue, 15 Dec 2015 08:00:50 -0500 Received: by mail-wm0-f52.google.com with SMTP id n186so163767543wmn.1; Tue, 15 Dec 2015 05:00:49 -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=P3SOz+LM6lXcbq4OZV5wiP4cYtq6vL/SVFVR3qj08T8=; b=N9uAeDFboc0Qv2ICnn11Dma0SnKodXU8RUHvno8YiWqhsrMvvd42OSq7xYqFDkRpbq IbgBywBMdTub+1Vi3Ka3KJvT0mSsaAMfRln6b4IrDSZcpYFRnL0BBPZ2XR5WthYrlfQv HovsItwJiTOxAweKly5/IeuI/AiJWoCIVdLwCq3v73QbfAquhINRVxZG8k1LXGi3q3oC 8X7gZoXAH5nhk3/ieuwc5GGCBlVvtlKJwcYwG1k3trbOwMzTDx4sdTxk4Bc3zTuDg74r 7B6Br5Yjjw4Fsb6EjpwX6DK44HEvpeFLbEir4NIPdeJKdv0yhtJbO8OW8741zAxPGXpt 6wjg== X-Received: by 10.194.71.104 with SMTP id t8mr42817884wju.177.1450184447938; Tue, 15 Dec 2015 05:00:47 -0800 (PST) Received: from Red.local (ANice-651-1-322-146.w83-201.abo.wanadoo.fr. [83.201.190.146]) by smtp.googlemail.com with ESMTPSA id q4sm1361487wja.6.2015.12.15.05.00.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 Dec 2015 05:00:47 -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 v3 4/4] crypto: ux500: Use precalculated hash from headers Date: Tue, 15 Dec 2015 14:00:23 +0100 Message-Id: <1450184423-31155-5-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.4.10 In-Reply-To: <1450184423-31155-1-git-send-email-clabbe.montjoie@gmail.com> References: <1450184423-31155-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/Kconfig | 1 + drivers/crypto/ux500/hash/hash_core.c | 20 ++------------------ 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/crypto/ux500/Kconfig b/drivers/crypto/ux500/Kconfig index 3079644..23abde6 100644 --- a/drivers/crypto/ux500/Kconfig +++ b/drivers/crypto/ux500/Kconfig @@ -18,6 +18,7 @@ config CRYPTO_DEV_UX500_HASH tristate "UX500 crypto driver for HASH block" depends on CRYPTO_DEV_UX500 select CRYPTO_HASH + select CRYPTO_SHA1 help This selects the hash driver for the UX500_HASH hardware. Depends on UX500/STM DMA if running in DMA mode. 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;