From patchwork Mon Mar 30 09:48:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46494 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f71.google.com (mail-oi0-f71.google.com [209.85.218.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0B487214C7 for ; Mon, 30 Mar 2015 09:49:13 +0000 (UTC) Received: by oifj189 with SMTP id j189sf173908987oif.3 for ; Mon, 30 Mar 2015 02:49:12 -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=I0LbpDX9cQOJW0jax6c4RlNVslszYztnIkyqqFqtvkg=; b=kvAoS6oIV6KQNsYJBaf4dUZnUvbIwj7JOOSmt8PWf5hDDADNSsV5DnB7PeZc9b7Xiw 2V6Z3qtb7XueB3lXBF2SkZvE2ycIy1hAIQMdKKfKnI0fKvmqyOGFqZdX9qLbc/xzMPUS pvx3CDtlIygs7XwJ+I3r2g32VpdqsVsBaISUN/Nvyb1mkU8UOwmuLJB+Zpt8H1eTvvCG zRQPKszvAKEwKH6M0pT202j0VMUOkPgpqfjk46jvM1lvRcMTvgRd8swIai4EFzpx0lgK yz2LVEi/Fiwm2IH+usLVAjlNFVwhmxacgzzurPhmrn8fXhPC8Z0k8zTBpbIlLN79O9NQ 7bng== X-Gm-Message-State: ALoCoQlzTY22OkCAwoMsi3G7ep92khxzez30Q7SSuny2pHSBzuROMjyVN9T0QLrtF/3QTBrxBAn4 X-Received: by 10.182.63.80 with SMTP id e16mr39586722obs.13.1427708952684; Mon, 30 Mar 2015 02:49:12 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.179 with SMTP id 48ls2253674qgj.64.gmail; Mon, 30 Mar 2015 02:49:12 -0700 (PDT) X-Received: by 10.140.96.165 with SMTP id k34mr38593491qge.79.1427708952580; Mon, 30 Mar 2015 02:49:12 -0700 (PDT) Received: from mail-qc0-f179.google.com (mail-qc0-f179.google.com. [209.85.216.179]) by mx.google.com with ESMTPS id a65si9184035qka.62.2015.03.30.02.49.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Mar 2015 02:49:12 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.216.179 as permitted sender) client-ip=209.85.216.179; Received: by qcgx3 with SMTP id x3so8553097qcg.3 for ; Mon, 30 Mar 2015 02:49:12 -0700 (PDT) X-Received: by 10.140.148.147 with SMTP id 141mr16808771qhu.45.1427708952462; Mon, 30 Mar 2015 02:49:12 -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 vz7csp1329339qdb; Mon, 30 Mar 2015 02:49:11 -0700 (PDT) X-Received: by 10.66.189.105 with SMTP id gh9mr56166221pac.41.1427708951287; Mon, 30 Mar 2015 02:49:11 -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.10 for ; Mon, 30 Mar 2015 02:49:11 -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 S1752657AbbC3JtK (ORCPT ); Mon, 30 Mar 2015 05:49:10 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:33917 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbbC3JtJ (ORCPT ); Mon, 30 Mar 2015 05:49:09 -0400 Received: by wgbdm7 with SMTP id dm7so61134464wgb.1 for ; Mon, 30 Mar 2015 02:49:08 -0700 (PDT) X-Received: by 10.194.2.145 with SMTP id 17mr60628729wju.79.1427708948151; Mon, 30 Mar 2015 02:49:08 -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.05 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Mar 2015 02:49:07 -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 06/14] crypto: sha1-generic: move to generic glue implementation Date: Mon, 30 Mar 2015 11:48:25 +0200 Message-Id: <1427708913-29678-7-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.179 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: , This updated the generic SHA-1 implementation to use the generic shared SHA-1 glue code. It also implements a .finup hook crypto_sha1_finup() and exports it to other modules. Signed-off-by: Ard Biesheuvel --- crypto/Kconfig | 1 + crypto/sha1_generic.c | 105 ++++++++++++-------------------------------------- include/crypto/sha.h | 3 ++ 3 files changed, 29 insertions(+), 80 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 72bf5af7240d..8f16d90f7c55 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -522,6 +522,7 @@ config CRYPTO_SHA1_BASE config CRYPTO_SHA1 tristate "SHA1 digest algorithm" select CRYPTO_HASH + select CRYPTO_SHA1_BASE help SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2). diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c index a3e50c37eb6f..3975f63ea6f9 100644 --- a/crypto/sha1_generic.c +++ b/crypto/sha1_generic.c @@ -25,107 +25,52 @@ #include #include -static int sha1_init(struct shash_desc *desc) +static void sha1_generic_block_fn(int blocks, u8 const *src, u32 *state, + const u8 *head, void *p) { - struct sha1_state *sctx = shash_desc_ctx(desc); + u32 temp[SHA_WORKSPACE_WORDS]; - *sctx = (struct sha1_state){ - .state = { SHA1_H0, SHA1_H1, SHA1_H2, SHA1_H3, SHA1_H4 }, - }; + if (head) + sha_transform(state, head, temp); - return 0; + while (blocks--) { + sha_transform(state, src, temp); + src += SHA1_BLOCK_SIZE; + } } int crypto_sha1_update(struct shash_desc *desc, const u8 *data, unsigned int len) { - struct sha1_state *sctx = shash_desc_ctx(desc); - unsigned int partial, done; - const u8 *src; - - partial = sctx->count % SHA1_BLOCK_SIZE; - sctx->count += len; - done = 0; - src = data; - - if ((partial + len) >= SHA1_BLOCK_SIZE) { - u32 temp[SHA_WORKSPACE_WORDS]; - - if (partial) { - done = -partial; - memcpy(sctx->buffer + partial, data, - done + SHA1_BLOCK_SIZE); - src = sctx->buffer; - } - - do { - sha_transform(sctx->state, src, temp); - done += SHA1_BLOCK_SIZE; - src = data + done; - } while (done + SHA1_BLOCK_SIZE <= len); - - memzero_explicit(temp, sizeof(temp)); - partial = 0; - } - memcpy(sctx->buffer + partial, src, len - done); - - return 0; + return crypto_sha1_base_do_update(desc, data, len, + sha1_generic_block_fn, NULL); } EXPORT_SYMBOL(crypto_sha1_update); - -/* 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); - __be32 *dst = (__be32 *)out; - u32 i, index, padlen; - __be64 bits; - static const u8 padding[64] = { 0x80, }; - - bits = cpu_to_be64(sctx->count << 3); - - /* Pad out to 56 mod 64 */ - index = sctx->count & 0x3f; - padlen = (index < 56) ? (56 - index) : ((64+56) - index); - crypto_sha1_update(desc, padding, padlen); - - /* Append length */ - crypto_sha1_update(desc, (const u8 *)&bits, sizeof(bits)); - - /* 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; -} - -static int sha1_export(struct shash_desc *desc, void *out) +int crypto_sha1_finup(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *out) { - struct sha1_state *sctx = shash_desc_ctx(desc); - - memcpy(out, sctx, sizeof(*sctx)); - return 0; + if (len) + crypto_sha1_base_do_update(desc, data, len, + sha1_generic_block_fn, NULL); + crypto_sha1_base_do_finalize(desc, sha1_generic_block_fn, NULL); + return crypto_sha1_base_finish(desc, out); } +EXPORT_SYMBOL(crypto_sha1_finup); -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 crypto_sha1_finup(desc, NULL, 0, out); } static struct shash_alg alg = { .digestsize = SHA1_DIGEST_SIZE, - .init = sha1_init, + .init = crypto_sha1_base_init, .update = crypto_sha1_update, .final = sha1_final, - .export = sha1_export, - .import = sha1_import, + .export = crypto_sha1_base_export, + .import = crypto_sha1_base_import, .descsize = sizeof(struct sha1_state), .statesize = sizeof(struct sha1_state), .base = { diff --git a/include/crypto/sha.h b/include/crypto/sha.h index 1b4d9a87c2a4..7bb3140d2d8a 100644 --- a/include/crypto/sha.h +++ b/include/crypto/sha.h @@ -94,6 +94,9 @@ struct shash_desc; extern int crypto_sha1_update(struct shash_desc *desc, const u8 *data, unsigned int len); +extern int crypto_sha1_finup(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *hash); + extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data, unsigned int len);