From patchwork Mon Mar 30 09:36:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 6119161 Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D8A689F389 for ; Mon, 30 Mar 2015 09:37:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D550A203B7 for ; Mon, 30 Mar 2015 09:37:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98BBC203DF for ; Mon, 30 Mar 2015 09:37:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752830AbbC3Jg7 (ORCPT ); Mon, 30 Mar 2015 05:36:59 -0400 Received: from mail-wg0-f43.google.com ([74.125.82.43]:34541 "EHLO mail-wg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752679AbbC3Jg7 (ORCPT ); Mon, 30 Mar 2015 05:36:59 -0400 Received: by wgbdm7 with SMTP id dm7so60722872wgb.1 for ; Mon, 30 Mar 2015 02:36:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HYYD0IEwoHue1bXb9qeoVbwr574j1wtjrH7/+Qo92Cw=; b=JmFLu06radiSHLG91t2HtKeFt7B89DYv0wDBAe5NLwIW1LScqQUEX1GbDmRxMZr9kZ Lr+FGXRGvcnqhVgCQvbio7GHO3MLG9Ho2seKdbCpsuYAs4egWtIVCZdM21Co9j3a0zLn 9ur9iGtzrIV53d+2WTsuEcXcOaFHLle+brjLjmZJS+I+iMlDJYdEamu4DZuNQcTAIIHY DB5xCNW8jSMp1t62hjAeMzBHzQ5DC/ZDCzCb7wzqByXsNcP2fe7xcQ7isgn4Z2uV1NlB zdGMNrQ83T3R+oRpuwb/iiXtFFbP/+7+GPrf/QCjY2uvKevtNOpNV4EE6GipujtK7xKy IARw== X-Gm-Message-State: ALoCoQmIl154E1/O5MWwaKVzP0Z2hYBukKKA8dMGd9/s72sokyUi71vGLafd6xskDcIZq/EBYeIX X-Received: by 10.180.7.134 with SMTP id j6mr21053707wia.11.1427708217827; Mon, 30 Mar 2015 02:36:57 -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 jt8sm15507705wid.4.2015.03.30.02.36.55 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Mar 2015 02:36:57 -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 04/14] crypto: sha512-generic: move to generic glue implementation Date: Mon, 30 Mar 2015 11:36:17 +0200 Message-Id: <1427708184-2353-8-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1427708184-2353-1-git-send-email-ard.biesheuvel@linaro.org> References: <1427708184-2353-1-git-send-email-ard.biesheuvel@linaro.org> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This updated the generic SHA-512 implementation to use the generic shared SHA-512 glue code. It also implements a .finup hook crypto_sha512_finup() and exports it to other modules. Signed-off-by: Ard Biesheuvel --- crypto/Kconfig | 1 + crypto/sha512_generic.c | 126 ++++++++++-------------------------------------- include/crypto/sha.h | 2 + 3 files changed, 28 insertions(+), 101 deletions(-) diff --git a/crypto/Kconfig b/crypto/Kconfig index 155cc15c2719..83bc1680391a 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -653,6 +653,7 @@ config CRYPTO_SHA512_BASE config CRYPTO_SHA512 tristate "SHA384 and SHA512 digest algorithms" + select CRYPTO_SHA512_BASE select CRYPTO_HASH help SHA512 secure hash standard (DFIPS 180-2). diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c index 1c3c3767e079..88f36a6920ef 100644 --- a/crypto/sha512_generic.c +++ b/crypto/sha512_generic.c @@ -130,125 +130,48 @@ sha512_transform(u64 *state, const u8 *input) a = b = c = d = e = f = g = h = t1 = t2 = 0; } -static int -sha512_init(struct shash_desc *desc) +static void sha512_generic_block_fn(int blocks, u8 const *src, u64 *state, + const u8 *head, void *p) { - struct sha512_state *sctx = shash_desc_ctx(desc); - sctx->state[0] = SHA512_H0; - sctx->state[1] = SHA512_H1; - sctx->state[2] = SHA512_H2; - sctx->state[3] = SHA512_H3; - sctx->state[4] = SHA512_H4; - sctx->state[5] = SHA512_H5; - sctx->state[6] = SHA512_H6; - sctx->state[7] = SHA512_H7; - sctx->count[0] = sctx->count[1] = 0; + if (head) + sha512_transform(state, head); - return 0; -} - -static int -sha384_init(struct shash_desc *desc) -{ - struct sha512_state *sctx = shash_desc_ctx(desc); - sctx->state[0] = SHA384_H0; - sctx->state[1] = SHA384_H1; - sctx->state[2] = SHA384_H2; - sctx->state[3] = SHA384_H3; - sctx->state[4] = SHA384_H4; - sctx->state[5] = SHA384_H5; - sctx->state[6] = SHA384_H6; - sctx->state[7] = SHA384_H7; - sctx->count[0] = sctx->count[1] = 0; - - return 0; + while (blocks--) { + sha512_transform(state, src); + src += SHA512_BLOCK_SIZE; + } } int crypto_sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len) { - struct sha512_state *sctx = shash_desc_ctx(desc); - - unsigned int i, index, part_len; - - /* Compute number of bytes mod 128 */ - index = sctx->count[0] & 0x7f; - - /* Update number of bytes */ - if ((sctx->count[0] += len) < len) - sctx->count[1]++; - - part_len = 128 - index; - - /* Transform as many times as possible. */ - if (len >= part_len) { - memcpy(&sctx->buf[index], data, part_len); - sha512_transform(sctx->state, sctx->buf); - - for (i = part_len; i + 127 < len; i+=128) - sha512_transform(sctx->state, &data[i]); - - index = 0; - } else { - i = 0; - } - - /* Buffer remaining input */ - memcpy(&sctx->buf[index], &data[i], len - i); - - return 0; + return crypto_sha512_base_do_update(desc, data, len, + sha512_generic_block_fn, NULL); } EXPORT_SYMBOL(crypto_sha512_update); -static int -sha512_final(struct shash_desc *desc, u8 *hash) +int crypto_sha512_finup(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *hash) { - struct sha512_state *sctx = shash_desc_ctx(desc); - static u8 padding[128] = { 0x80, }; - __be64 *dst = (__be64 *)hash; - __be64 bits[2]; - unsigned int index, pad_len; - int i; - - /* Save number of bits */ - bits[1] = cpu_to_be64(sctx->count[0] << 3); - bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61); - - /* Pad out to 112 mod 128. */ - index = sctx->count[0] & 0x7f; - pad_len = (index < 112) ? (112 - index) : ((128+112) - index); - crypto_sha512_update(desc, padding, pad_len); - - /* Append length (before padding) */ - crypto_sha512_update(desc, (const u8 *)bits, sizeof(bits)); - - /* Store state in digest */ - for (i = 0; i < 8; i++) - dst[i] = cpu_to_be64(sctx->state[i]); - - /* Zeroize sensitive information. */ - memset(sctx, 0, sizeof(struct sha512_state)); - - return 0; + if (len) + crypto_sha512_base_do_update(desc, data, len, + sha512_generic_block_fn, NULL); + crypto_sha512_base_do_finalize(desc, sha512_generic_block_fn, NULL); + return crypto_sha512_base_finish(desc, hash); } +EXPORT_SYMBOL(crypto_sha512_finup); -static int sha384_final(struct shash_desc *desc, u8 *hash) +int sha512_final(struct shash_desc *desc, u8 *hash) { - u8 D[64]; - - sha512_final(desc, D); - - memcpy(hash, D, 48); - memzero_explicit(D, 64); - - return 0; + return crypto_sha512_finup(desc, NULL, 0, hash); } static struct shash_alg sha512_algs[2] = { { .digestsize = SHA512_DIGEST_SIZE, - .init = sha512_init, + .init = crypto_sha512_base_init, .update = crypto_sha512_update, .final = sha512_final, + .finup = crypto_sha512_finup, .descsize = sizeof(struct sha512_state), .base = { .cra_name = "sha512", @@ -259,9 +182,10 @@ static struct shash_alg sha512_algs[2] = { { } }, { .digestsize = SHA384_DIGEST_SIZE, - .init = sha384_init, + .init = crypto_sha384_base_init, .update = crypto_sha512_update, - .final = sha384_final, + .final = sha512_final, + .finup = crypto_sha512_finup, .descsize = sizeof(struct sha512_state), .base = { .cra_name = "sha384", diff --git a/include/crypto/sha.h b/include/crypto/sha.h index 63cba0bbf3bc..17a1c43b2a01 100644 --- a/include/crypto/sha.h +++ b/include/crypto/sha.h @@ -100,6 +100,8 @@ extern int crypto_sha256_update(struct shash_desc *desc, const u8 *data, extern int crypto_sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len); +extern int crypto_sha512_finup(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *hash); extern int crypto_sha384_base_init(struct shash_desc *desc); extern int crypto_sha512_base_init(struct shash_desc *desc);