From patchwork Sat Mar 28 22:10: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: 46456 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 308B221585 for ; Sat, 28 Mar 2015 22:10:56 +0000 (UTC) Received: by wibdy1 with SMTP id dy1sf10776530wib.3 for ; Sat, 28 Mar 2015 15:10:55 -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=1nREh1/OwhVrXmn+dPn4NVDklBOSD/OcAP+JgQlUqAE=; b=cVbO/r9JhmbWhN+zcwH7T5SJwLw4SRjdSFFkhBf4eMiNyFJtBc3yf0/yE21vLksRQr hs17pVYpZS+HEst+LGRCTE+k+wtBl9WZjZ9cVHXxGgRVBuluPrSjoXdBM4q5RWem8Zu2 DA6zg2shakK8nhOgiw45VsEtXC2kymaU9DxvDj4Qw8GLf9c102K2jE48xPVpb5oKFp2m ujQtcmeXO85L7GvSSyLx1v+U9MN6BZAEJbscxJkM2LaMD/r9oidgRSntF67R8hxyQ3Ob MBs0iLtEwS7CwV5mY8+nhYCFisttR2bfM72PNijHVrjeP6SRIbQuAm+uj0pZoYF8IID7 5uag== X-Gm-Message-State: ALoCoQle1sFqeP0X9dCMaoda89suW5IlfD99LLBDxLyB310o6uQQ4ylhBsKFRaJ9Sx5MI9hHTM0t X-Received: by 10.180.9.228 with SMTP id d4mr2084698wib.1.1427580655484; Sat, 28 Mar 2015 15:10:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.198.232 with SMTP id jf8ls495963lac.83.gmail; Sat, 28 Mar 2015 15:10:55 -0700 (PDT) X-Received: by 10.112.53.73 with SMTP id z9mr1405451lbo.118.1427580655175; Sat, 28 Mar 2015 15:10:55 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id ej8si4122114lad.141.2015.03.28.15.10.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 28 Mar 2015 15:10:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbcmq2 with SMTP id mq2so84952120lbc.0 for ; Sat, 28 Mar 2015 15:10:55 -0700 (PDT) X-Received: by 10.152.19.199 with SMTP id h7mr23578159lae.32.1427580655069; Sat, 28 Mar 2015 15:10:55 -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.57.201 with SMTP id k9csp627799lbq; Sat, 28 Mar 2015 15:10:54 -0700 (PDT) X-Received: by 10.67.22.72 with SMTP id hq8mr24126898pad.154.1427580653117; Sat, 28 Mar 2015 15:10:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m4si8382559pap.204.2015.03.28.15.10.52 for ; Sat, 28 Mar 2015 15:10:53 -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 S1752495AbbC1WKv (ORCPT ); Sat, 28 Mar 2015 18:10:51 -0400 Received: from mail-wg0-f46.google.com ([74.125.82.46]:33867 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752372AbbC1WKv (ORCPT ); Sat, 28 Mar 2015 18:10:51 -0400 Received: by wgbdm7 with SMTP id dm7so27265212wgb.1 for ; Sat, 28 Mar 2015 15:10:49 -0700 (PDT) X-Received: by 10.180.9.47 with SMTP id w15mr8997956wia.13.1427580649758; Sat, 28 Mar 2015 15:10:49 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.5.202]) by mx.google.com with ESMTPSA id i5sm8776803wiz.0.2015.03.28.15.10.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 28 Mar 2015 15:10:48 -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 Cc: Ard Biesheuvel Subject: [RFC PATCH 3/6] crypto: sha256: implement base layer for SHA-256 Date: Sat, 28 Mar 2015 23:10:25 +0100 Message-Id: <1427580628-7128-4-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1427580628-7128-1-git-send-email-ard.biesheuvel@linaro.org> References: <1427580628-7128-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.217.169 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 | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/crypto/sha.h | 17 +++++++ 4 files changed, 160 insertions(+) create mode 100644 crypto/sha256_base.c diff --git a/crypto/Kconfig b/crypto/Kconfig index 880aa518c2eb..551bbf2e2ab5 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..1ba2f6812c6b --- /dev/null +++ b/crypto/sha256_base.c @@ -0,0 +1,138 @@ +/* + * 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 sha224_base_init(struct shash_desc *desc) +{ + struct sha256_state *sctx = shash_desc_ctx(desc); + + *sctx = (struct sha256_state){ + .state = { + SHA224_H0, SHA224_H1, SHA224_H2, SHA224_H3, + SHA224_H4, SHA224_H5, SHA224_H6, SHA224_H7, + } + }; + return 0; +} +EXPORT_SYMBOL(sha224_base_init); + +int sha256_base_init(struct shash_desc *desc) +{ + struct sha256_state *sctx = shash_desc_ctx(desc); + + *sctx = (struct sha256_state){ + .state = { + SHA256_H0, SHA256_H1, SHA256_H2, SHA256_H3, + SHA256_H4, SHA256_H5, SHA256_H6, SHA256_H7, + } + }; + return 0; +} +EXPORT_SYMBOL(sha256_base_init); + +int 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(sha256_base_export); + +int 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(sha256_base_import); + +int 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 ((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(sha256_base_do_update); + +int sha256_base_do_finalize(struct shash_desc *desc, sha256_block_fn *block_fn, + void *p) +{ + static const u8 padding[SHA256_BLOCK_SIZE] = { 0x80, }; + + struct sha256_state *sctx = shash_desc_ctx(desc); + unsigned int padlen; + __be64 bits; + + padlen = SHA256_BLOCK_SIZE - + (sctx->count + sizeof(bits)) % SHA256_BLOCK_SIZE; + + bits = cpu_to_be64(sctx->count << 3); + + sha256_base_do_update(desc, padding, padlen, block_fn, p); + + memcpy(sctx->buf + SHA256_BLOCK_SIZE - sizeof(bits), + &bits, sizeof(bits)); + block_fn(1, sctx->buf, sctx->state, NULL, p); + return 0; +} +EXPORT_SYMBOL(sha256_base_do_finalize); + +int 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(sha256_base_finish); diff --git a/include/crypto/sha.h b/include/crypto/sha.h index d252a8fcc4de..bc87995e9771 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 sha512_base_do_finalize(struct shash_desc *desc, extern int sha512_base_finish(struct shash_desc *desc, u8 *out); +extern int sha224_base_init(struct shash_desc *desc); +extern int sha256_base_init(struct shash_desc *desc); + +extern int sha256_base_export(struct shash_desc *desc, void *out); +extern int sha256_base_import(struct shash_desc *desc, const void *in); + +extern int sha256_base_do_update(struct shash_desc *desc, const u8 *data, + unsigned int len, sha256_block_fn *block_fn, + void *p); + +extern int sha256_base_do_finalize(struct shash_desc *desc, + sha256_block_fn *block_fn, void *p); + +extern int sha256_base_finish(struct shash_desc *desc, u8 *out); + #endif