From patchwork Tue Apr 7 08:51:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46812 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f198.google.com (mail-wi0-f198.google.com [209.85.212.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E63D720553 for ; Tue, 7 Apr 2015 08:52:41 +0000 (UTC) Received: by wiaa2 with SMTP id a2sf1899067wia.1 for ; Tue, 07 Apr 2015 01:52:41 -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=hsa5OqdTMGe6rC5O7Xo/SOk2oCPFGeFhpIaYdP3RWTg=; b=B/ALC2LeY0atA7egMTUlHVWJYdkzWeAwhEp/FE3lUOYRD92jV+SdOOEJsv+iZmSOn1 SFO1YA9PJN6vUJsV0bnxjJSYdiBcJo5eRj8/FoLP/vn+TaoZ5bYktuHK48XPY6bUe0eQ xKGQBiJXOxno8L7FjnZ153RQopmOehK3mUVwqPPR11vhHSrGZqsXIpyKos2WuovtaJ1I E3rOr4mfoBTrrSUWzaL67Didd9dVDKh4uVvSRaLTtgXGA1jdVZ0LPbZqR1xkSRGyQamV goJmzC4ZaYyCI376TNvyh0QGALF/Bop24annN/ayhe37Geuno4RGIvPAZpD9L2yO8YXd 9C2Q== X-Gm-Message-State: ALoCoQlYyv1/W/ARjLcindx1yI+H3rXrMx4iKnh1w/C5YvSGk8tiOkiO52qKaFC8nMPS5G/e+dqk X-Received: by 10.112.142.1 with SMTP id rs1mr3881500lbb.19.1428396761204; Tue, 07 Apr 2015 01:52:41 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.21.130 with SMTP id v2ls12603lae.98.gmail; Tue, 07 Apr 2015 01:52:41 -0700 (PDT) X-Received: by 10.152.88.99 with SMTP id bf3mr16774383lab.97.1428396761059; Tue, 07 Apr 2015 01:52:41 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id o8si5433689laj.176.2015.04.07.01.52.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Apr 2015 01:52:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by laat2 with SMTP id t2so29880591laa.1 for ; Tue, 07 Apr 2015 01:52:40 -0700 (PDT) X-Received: by 10.112.119.234 with SMTP id kx10mr13491352lbb.35.1428396760646; Tue, 07 Apr 2015 01:52:40 -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.112.67.65 with SMTP id l1csp291616lbt; Tue, 7 Apr 2015 01:52:39 -0700 (PDT) X-Received: by 10.66.190.102 with SMTP id gp6mr35266741pac.100.1428396756990; Tue, 07 Apr 2015 01:52:36 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h4si2547968pdj.248.2015.04.07.01.52.35 for ; Tue, 07 Apr 2015 01:52:36 -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 S1752822AbbDGIwe (ORCPT ); Tue, 7 Apr 2015 04:52:34 -0400 Received: from mail-wi0-f176.google.com ([209.85.212.176]:34243 "EHLO mail-wi0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752694AbbDGIwd (ORCPT ); Tue, 7 Apr 2015 04:52:33 -0400 Received: by widjs5 with SMTP id js5so5689069wid.1 for ; Tue, 07 Apr 2015 01:52:32 -0700 (PDT) X-Received: by 10.180.81.104 with SMTP id z8mr2619319wix.23.1428396752547; Tue, 07 Apr 2015 01:52:32 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.4.191]) by mx.google.com with ESMTPSA id q10sm9935641wjr.41.2015.04.07.01.52.30 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 Apr 2015 01:52:31 -0700 (PDT) From: Ard Biesheuvel To: linux-crypto@vger.kernel.org, linux-arm-kernel@lists.infradead.org, x86@kernel.org, herbert@gondor.apana.org.au, samitolvanen@google.com, jussi.kivilinna@iki.fi Cc: stockhausen@collogia.de, Ard Biesheuvel Subject: [PATCH v3 04/16] crypto: sha1-generic: move to generic glue implementation Date: Tue, 7 Apr 2015 10:51:52 +0200 Message-Id: <1428396724-19962-5-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1428396724-19962-1-git-send-email-ard.biesheuvel@linaro.org> References: <1428396724-19962-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.215.47 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 updates 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/sha1_generic.c | 108 +++++++++++++------------------------------------- include/crypto/sha.h | 3 ++ 2 files changed, 31 insertions(+), 80 deletions(-) diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c index a3e50c37eb6f..322a2278d939 100644 --- a/crypto/sha1_generic.c +++ b/crypto/sha1_generic.c @@ -23,109 +23,57 @@ #include #include #include +#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; + } + memzero_explicit(temp, sizeof(temp)); } 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 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) + sha1_base_do_update(desc, data, len, sha1_generic_block_fn, + NULL); + sha1_base_do_finalize(desc, sha1_generic_block_fn, NULL); + return 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 = sha1_base_init, .update = crypto_sha1_update, .final = sha1_final, - .export = sha1_export, - .import = sha1_import, + .finup = crypto_sha1_finup, + .export = sha1_base_export, + .import = 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 190f8a0e0242..10e2009f5464 100644 --- a/include/crypto/sha.h +++ b/include/crypto/sha.h @@ -87,6 +87,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);