From patchwork Mon Mar 30 09:48:21 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46490 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 42CE7214C7 for ; Mon, 30 Mar 2015 09:49:00 +0000 (UTC) Received: by qcay5 with SMTP id y5sf96763625qca.3 for ; Mon, 30 Mar 2015 02:49:00 -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=fzZ4IQISUoMr9gF4rtXaTyYoZV380kVf4YoBYVQya0I=; b=OtLFc+vj1rBQVnw8bSGiBpx2qO+ep3qSRiC37VTHDDUXE3TscsfXQDIuW+OOHIe0N0 UWRQIHv9rJ6i7bzlYsWB3/uKugL8CjtQPvrweDdYjBIl3c2lUa6b4vd4TwbIAmc1UHEJ Q2s24pWm5XxGj8DBmTsDatc5z5T9Ia51IEOY9gjhkDdUtZ/JY3ns6nUuVkLlK9iLFVOB vSKGw24Kn8LtfMT8QDTyvruYDArI9qS+S5mjEzwOINUho58yAwFep+P87fOKhGJzo6I1 Rh7ocbNUMJLUGXTy1bf+AyfMxBIA0P0WfH+zEWRm8L1/RS/sZOrw0uul0cahtzFhVnHO vuWQ== X-Gm-Message-State: ALoCoQkseB5JiAk8JfvfRiFHNgpL+KkG0GAL8yeZ6Sh1WEymGLRqf5/B3NlCxl+aZKRfpXMscgJ1 X-Received: by 10.236.230.39 with SMTP id i37mr36659810yhq.47.1427708940096; Mon, 30 Mar 2015 02:49:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.230 with SMTP id l93ls2350808qgf.70.gmail; Mon, 30 Mar 2015 02:49:00 -0700 (PDT) X-Received: by 10.55.52.14 with SMTP id b14mr12110269qka.63.1427708940019; Mon, 30 Mar 2015 02:49:00 -0700 (PDT) Received: from mail-qg0-f45.google.com (mail-qg0-f45.google.com. [209.85.192.45]) by mx.google.com with ESMTPS id 15si9865634qga.22.2015.03.30.02.48.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 30 Mar 2015 02:49:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.192.45 as permitted sender) client-ip=209.85.192.45; Received: by qgfa8 with SMTP id a8so175481551qgf.0 for ; Mon, 30 Mar 2015 02:48:59 -0700 (PDT) X-Received: by 10.55.31.71 with SMTP id f68mr66303866qkf.7.1427708939884; Mon, 30 Mar 2015 02:48:59 -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 vz7csp1329223qdb; Mon, 30 Mar 2015 02:48:59 -0700 (PDT) X-Received: by 10.70.119.37 with SMTP id kr5mr56678623pdb.107.1427708938980; Mon, 30 Mar 2015 02:48:58 -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.48.58 for ; Mon, 30 Mar 2015 02:48:58 -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 S1752563AbbC3Js5 (ORCPT ); Mon, 30 Mar 2015 05:48:57 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:34644 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbbC3Js5 (ORCPT ); Mon, 30 Mar 2015 05:48:57 -0400 Received: by wgbdm7 with SMTP id dm7so61127483wgb.1 for ; Mon, 30 Mar 2015 02:48:56 -0700 (PDT) X-Received: by 10.181.8.99 with SMTP id dj3mr20999691wid.83.1427708936183; Mon, 30 Mar 2015 02:48:56 -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.48.53 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Mar 2015 02:48:55 -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 02/14] crypto: sha256: implement base layer for SHA-256 Date: Mon, 30 Mar 2015 11:48:21 +0200 Message-Id: <1427708913-29678-3-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.192.45 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: , To reduce the number of copies of boilerplate code throughout the tree, this patch implements generic glue for the SHA-256 algorithm. This allows a specific arch or hardware implementation to only implement the special handling that it needs. Signed-off-by: Ard Biesheuvel --- crypto/Kconfig | 4 ++ crypto/Makefile | 1 + crypto/sha256_base.c | 140 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/crypto/sha.h | 17 +++++++ 4 files changed, 162 insertions(+) create mode 100644 crypto/sha256_base.c diff --git a/crypto/Kconfig b/crypto/Kconfig index 3400cf4e3cdb..1664bd68b97d 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -602,6 +602,10 @@ config CRYPTO_SHA1_MB lanes remain unfilled, a flush operation will be initiated to process the crypto jobs, adding a slight latency. + +config CRYPTO_SHA256_BASE + tristate + config CRYPTO_SHA256 tristate "SHA224 and SHA256 digest algorithm" select CRYPTO_HASH diff --git a/crypto/Makefile b/crypto/Makefile index 6174bf2592fe..bb9bafeb3ac7 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o obj-$(CONFIG_CRYPTO_RMD256) += rmd256.o obj-$(CONFIG_CRYPTO_RMD320) += rmd320.o obj-$(CONFIG_CRYPTO_SHA1) += sha1_generic.o +obj-$(CONFIG_CRYPTO_SHA256_BASE) += sha256_base.o obj-$(CONFIG_CRYPTO_SHA256) += sha256_generic.o obj-$(CONFIG_CRYPTO_SHA512_BASE) += sha512_base.o obj-$(CONFIG_CRYPTO_SHA512) += sha512_generic.o diff --git a/crypto/sha256_base.c b/crypto/sha256_base.c new file mode 100644 index 000000000000..5fd728066912 --- /dev/null +++ b/crypto/sha256_base.c @@ -0,0 +1,140 @@ +/* + * sha256_base.c - core logic for SHA-256 implementations + * + * Copyright (C) 2015 Linaro Ltd + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include + +#include + +int crypto_sha224_base_init(struct shash_desc *desc) +{ + static const u32 sha224_init_state[] = { + SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3, + SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7, + }; + struct sha256_state *sctx = shash_desc_ctx(desc); + + memcpy(sctx->state, sha224_init_state, sizeof(sctx->state)); + sctx->count = 0; + return 0; +} +EXPORT_SYMBOL(crypto_sha224_base_init); + +int crypto_sha256_base_init(struct shash_desc *desc) +{ + static const u32 sha256_init_state[] = { + SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3, + SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7, + }; + struct sha256_state *sctx = shash_desc_ctx(desc); + + memcpy(sctx->state, sha256_init_state, sizeof(sctx->state)); + sctx->count = 0; + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_init); + +int crypto_sha256_base_export(struct shash_desc *desc, void *out) +{ + struct sha256_state *sctx = shash_desc_ctx(desc); + struct sha256_state *dst = out; + + *dst = *sctx; + + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_export); + +int crypto_sha256_base_import(struct shash_desc *desc, const void *in) +{ + struct sha256_state *sctx = shash_desc_ctx(desc); + struct sha256_state const *src = in; + + *sctx = *src; + + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_import); + +int crypto_sha256_base_do_update(struct shash_desc *desc, const u8 *data, + unsigned int len, sha256_block_fn *block_fn, + void *p) +{ + struct sha256_state *sctx = shash_desc_ctx(desc); + unsigned int partial = sctx->count % SHA256_BLOCK_SIZE; + + sctx->count += len; + + if (unlikely((partial + len) >= SHA256_BLOCK_SIZE)) { + int blocks; + + if (partial) { + int p = SHA256_BLOCK_SIZE - partial; + + memcpy(sctx->buf + partial, data, p); + data += p; + len -= p; + } + + blocks = len / SHA256_BLOCK_SIZE; + len %= SHA256_BLOCK_SIZE; + + block_fn(blocks, data, sctx->state, + partial ? sctx->buf : NULL, p); + data += blocks * SHA256_BLOCK_SIZE; + partial = 0; + } + if (len) + memcpy(sctx->buf + partial, data, len); + + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_do_update); + +int crypto_sha256_base_do_finalize(struct shash_desc *desc, + sha256_block_fn *block_fn, void *p) +{ + const int bit_offset = SHA256_BLOCK_SIZE - sizeof(__be64); + struct sha256_state *sctx = shash_desc_ctx(desc); + __be64 *bits = (__be64 *)(sctx->buf + bit_offset); + unsigned int partial = sctx->count % SHA256_BLOCK_SIZE; + + sctx->buf[partial++] = 0x80; + if (partial > bit_offset) { + memset(sctx->buf + partial, 0x0, SHA256_BLOCK_SIZE - partial); + partial = 0; + + block_fn(1, sctx->buf, sctx->state, NULL, p); + } + + memset(sctx->buf + partial, 0x0, bit_offset - partial); + *bits = cpu_to_be64(sctx->count << 3); + block_fn(1, sctx->buf, sctx->state, NULL, p); + + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_do_finalize); + +int crypto_sha256_base_finish(struct shash_desc *desc, u8 *out) +{ + unsigned int digest_size = crypto_shash_digestsize(desc->tfm); + struct sha256_state *sctx = shash_desc_ctx(desc); + __be32 *digest = (__be32 *)out; + int i; + + for (i = 0; digest_size > 0; i++, digest_size -= sizeof(__be32)) + put_unaligned_be32(sctx->state[i], digest++); + + *sctx = (struct sha256_state){}; + return 0; +} +EXPORT_SYMBOL(crypto_sha256_base_finish); diff --git a/include/crypto/sha.h b/include/crypto/sha.h index 85997a17d4e2..0ed6630d7c40 100644 --- a/include/crypto/sha.h +++ b/include/crypto/sha.h @@ -82,6 +82,8 @@ struct sha512_state { u8 buf[SHA512_BLOCK_SIZE]; }; +typedef void (sha256_block_fn)(int blocks, u8 const *src, u32 *state, + const u8 *head, void *p); typedef void (sha512_block_fn)(int blocks, u8 const *src, u64 *state, const u8 *head, void *p); @@ -112,4 +114,19 @@ extern int crypto_sha512_base_do_finalize(struct shash_desc *desc, extern int crypto_sha512_base_finish(struct shash_desc *desc, u8 *out); +extern int crypto_sha224_base_init(struct shash_desc *desc); +extern int crypto_sha256_base_init(struct shash_desc *desc); + +extern int crypto_sha256_base_export(struct shash_desc *desc, void *out); +extern int crypto_sha256_base_import(struct shash_desc *desc, const void *in); + +extern int crypto_sha256_base_do_update(struct shash_desc *desc, const u8 *data, + unsigned int len, sha256_block_fn *block_fn, + void *p); + +extern int crypto_sha256_base_do_finalize(struct shash_desc *desc, + sha256_block_fn *block_fn, void *p); + +extern int crypto_sha256_base_finish(struct shash_desc *desc, u8 *out); + #endif