From patchwork Mon Mar 30 09:48:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46495 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 35D3C214C7 for ; Mon, 30 Mar 2015 09:49:16 +0000 (UTC) Received: by yhpu66 with SMTP id u66sf140884024yhp.0 for ; Mon, 30 Mar 2015 02:49:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=IH5+w6kqHnBRBz/GS05uWDh/4VjKEE2F2439eRLJBI8=; b=Eh+WzlO5aW+nVcGPeKtXFuOYG2i3A92KWmylRNdWBcEAN19fqOln+80ZLqN81SPxOJ 97fGDYrBNdgpThgHsBztYm138tTwxDgJqB+fwqk/rPVKA4hoEY84x4LRxbxNtibomLOK 5bXcD0LB/jEzMoT4UJKX6PjVbZ9N8HkCNJr2D+IrStIjed1RLLcRJTRBvr3+ZZiJtl7O lhZ4y+hxVIjrq3T7qIWVMwHC6hq3lRhEyhHziZ4eR1Bug3MQWKQ6UCAQtPsYtyDLwIMX QPUMwKSJB+IqBaM+z0n5SPVEuusIbRaC5QkOlkQFK5Xx+9/Mm4F7aNgR8tV/syD1tanS olJQ== X-Gm-Message-State: ALoCoQm7mBGW2PRamCgz8i3dTxZvcVlvWZxfeo/OwYTvaXygiG7HdMdU4bYbO1oNjfZJPnIpAP9C X-Received: by 10.236.203.196 with SMTP id f44mr37344221yho.15.1427708956040; Mon, 30 Mar 2015 02:49:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.137 with SMTP id k9ls2145932qge.6.gmail; Mon, 30 Mar 2015 02:49:16 -0700 (PDT) X-Received: by 10.140.238.138 with SMTP id j132mr7925666qhc.85.1427708955966; Mon, 30 Mar 2015 02:49:15 -0700 (PDT) Received: from mail-qc0-f181.google.com (mail-qc0-f181.google.com. [209.85.216.181]) by mx.google.com with ESMTPS id m63si9844076qge.85.2015.03.30.02.49.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Mar 2015 02:49:15 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.216.181 as permitted sender) client-ip=209.85.216.181; Received: by qcgx3 with SMTP id x3so8553934qcg.3 for ; Mon, 30 Mar 2015 02:49:15 -0700 (PDT) X-Received: by 10.55.52.84 with SMTP id b81mr365445qka.17.1427708955850; Mon, 30 Mar 2015 02:49:15 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.96.155.231 with SMTP id vz7csp1329368qdb; Mon, 30 Mar 2015 02:49:15 -0700 (PDT) X-Received: by 10.68.57.231 with SMTP id l7mr14265978pbq.48.1427708954242; Mon, 30 Mar 2015 02:49:14 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si14017272pdm.248.2015.03.30.02.49.13 for ; Mon, 30 Mar 2015 02:49:14 -0700 (PDT) Received-SPF: none (google.com: linux-crypto-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751482AbbC3JtN (ORCPT ); Mon, 30 Mar 2015 05:49:13 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:35647 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751398AbbC3JtM (ORCPT ); Mon, 30 Mar 2015 05:49:12 -0400 Received: by wicne17 with SMTP id ne17so23926062wic.0 for ; Mon, 30 Mar 2015 02:49:11 -0700 (PDT) X-Received: by 10.194.83.66 with SMTP id o2mr62719921wjy.55.1427708951231; Mon, 30 Mar 2015 02:49:11 -0700 (PDT) Received: from ards-macbook-pro.local (129.20.90.92.rev.sfr.net. [92.90.20.129]) by mx.google.com with ESMTPSA id eo1sm14912443wib.16.2015.03.30.02.49.08 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Mar 2015 02:49:10 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-crypto@vger.kernel.org, samitolvanen@google.com, herbert@gondor.apana.org.au, jussi.kivilinna@iki.fi, stockhausen@collogia.de, x86@kernel.org Cc: Ard Biesheuvel Subject: [PATCH v2 resend 07/14] crypto/arm: move SHA-1 ARM asm implementation to base layer Date: Mon, 30 Mar 2015 11:48:26 +0200 Message-Id: <1427708913-29678-8-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1427708913-29678-1-git-send-email-ard.biesheuvel@linaro.org> References: <1427708913-29678-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.216.181 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Ard Biesheuvel --- arch/arm/crypto/Kconfig | 1 + arch/arm/{include/asm => }/crypto/sha1.h | 3 + arch/arm/crypto/sha1_glue.c | 117 +++++++------------------------ 3 files changed, 28 insertions(+), 93 deletions(-) rename arch/arm/{include/asm => }/crypto/sha1.h (67%) diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig index d63f319924d2..c111d8992afb 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -11,6 +11,7 @@ if ARM_CRYPTO config CRYPTO_SHA1_ARM tristate "SHA1 digest algorithm (ARM-asm)" select CRYPTO_SHA1 + select CRYPTO_SHA1_BASE select CRYPTO_HASH help SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2) implemented diff --git a/arch/arm/include/asm/crypto/sha1.h b/arch/arm/crypto/sha1.h similarity index 67% rename from arch/arm/include/asm/crypto/sha1.h rename to arch/arm/crypto/sha1.h index 75e6a417416b..ffd8bd08b1a7 100644 --- a/arch/arm/include/asm/crypto/sha1.h +++ b/arch/arm/crypto/sha1.h @@ -7,4 +7,7 @@ extern int sha1_update_arm(struct shash_desc *desc, const u8 *data, unsigned int len); +extern int sha1_finup_arm(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *out); + #endif diff --git a/arch/arm/crypto/sha1_glue.c b/arch/arm/crypto/sha1_glue.c index e31b0440c613..b6a78be0367f 100644 --- a/arch/arm/crypto/sha1_glue.c +++ b/arch/arm/crypto/sha1_glue.c @@ -23,124 +23,55 @@ #include #include #include -#include +#include "sha1.h" asmlinkage void sha1_block_data_order(u32 *digest, const unsigned char *data, unsigned int rounds); - -static int sha1_init(struct shash_desc *desc) -{ - struct sha1_state *sctx = shash_desc_ctx(desc); - - *sctx = (struct sha1_state){ - .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 }, - }; - - return 0; -} - - -static int __sha1_update(struct sha1_state *sctx, const u8 *data, - unsigned int len, unsigned int partial) +static void sha1_arm_block_fn(int blocks, u8 const *src, u32 *state, + const u8 *head, void *p) { - unsigned int done = 0; - - sctx->count += len; - - if (partial) { - done = SHA1_BLOCK_SIZE - partial; - memcpy(sctx->buffer + partial, data, done); - sha1_block_data_order(sctx->state, sctx->buffer, 1); - } - - if (len - done >= SHA1_BLOCK_SIZE) { - const unsigned int rounds = (len - done) / SHA1_BLOCK_SIZE; - sha1_block_data_order(sctx->state, data + done, rounds); - done += rounds * SHA1_BLOCK_SIZE; - } - - memcpy(sctx->buffer, data + done, len - done); - return 0; + if (head) + sha1_block_data_order(state, head, 1); + if (blocks) + sha1_block_data_order(state, src, blocks); } - int sha1_update_arm(struct shash_desc *desc, const u8 *data, unsigned int len) { - struct sha1_state *sctx = shash_desc_ctx(desc); - unsigned int partial = sctx->count % SHA1_BLOCK_SIZE; - int res; - - /* Handle the fast case right here */ - if (partial + len < SHA1_BLOCK_SIZE) { - sctx->count += len; - memcpy(sctx->buffer + partial, data, len); - return 0; - } - res = __sha1_update(sctx, data, len, partial); - return res; + return crypto_sha1_base_do_update(desc, data, len, sha1_arm_block_fn, + NULL); } EXPORT_SYMBOL_GPL(sha1_update_arm); - -/* Add padding and return the message digest. */ -static int sha1_final(struct shash_desc *desc, u8 *out) +int sha1_finup_arm(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *out) { - struct sha1_state *sctx = shash_desc_ctx(desc); - unsigned int i, index, padlen; - __be32 *dst = (__be32 *)out; - __be64 bits; - static const u8 padding[SHA1_BLOCK_SIZE] = { 0x80, }; - - bits = cpu_to_be64(sctx->count << 3); - - /* Pad out to 56 mod 64 and append length */ - index = sctx->count % SHA1_BLOCK_SIZE; - padlen = (index < 56) ? (56 - index) : ((SHA1_BLOCK_SIZE+56) - index); - /* We need to fill a whole block for __sha1_update() */ - if (padlen <= 56) { - sctx->count += padlen; - memcpy(sctx->buffer + index, padding, padlen); - } else { - __sha1_update(sctx, padding, padlen, index); - } - __sha1_update(sctx, (const u8 *)&bits, sizeof(bits), 56); - - /* Store state in digest */ - for (i = 0; i < 5; i++) - dst[i] = cpu_to_be32(sctx->state[i]); - - /* Wipe context */ - memset(sctx, 0, sizeof(*sctx)); - return 0; -} - + if (len) + crypto_sha1_base_do_update(desc, data, len, + sha1_arm_block_fn, NULL); + crypto_sha1_base_do_finalize(desc, sha1_arm_block_fn, NULL); -static int sha1_export(struct shash_desc *desc, void *out) -{ - struct sha1_state *sctx = shash_desc_ctx(desc); - memcpy(out, sctx, sizeof(*sctx)); - return 0; + return crypto_sha1_base_finish(desc, out); } +EXPORT_SYMBOL_GPL(sha1_finup_arm); - -static int sha1_import(struct shash_desc *desc, const void *in) +/* Add padding and return the message digest. */ +static int sha1_final(struct shash_desc *desc, u8 *out) { - struct sha1_state *sctx = shash_desc_ctx(desc); - memcpy(sctx, in, sizeof(*sctx)); - return 0; + return sha1_finup_arm(desc, NULL, 0, out); } - static struct shash_alg alg = { .digestsize = SHA1_DIGEST_SIZE, - .init = sha1_init, + .init = crypto_sha1_base_init, .update = sha1_update_arm, .final = sha1_final, - .export = sha1_export, - .import = sha1_import, + .finup = sha1_finup_arm, + .export = crypto_sha1_base_export, + .import = crypto_sha1_base_import, .descsize = sizeof(struct sha1_state), .statesize = sizeof(struct sha1_state), .base = {