From patchwork Fri Apr 18 02:59:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 882688 Received: from abb.hmeau.com (abb.hmeau.com [144.6.53.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BF1BA2686B3 for ; Fri, 18 Apr 2025 02:59:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=144.6.53.87 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945200; cv=none; b=izpyxCTWzgMBnfkI1vNKc68d3qLdZOcsHpl+8+tRiRtq3Ydxmh6k05prX/vVTMVnT76BadRRz4PVQRyD8NHksTqhFeXNcaSS90vSetUQf+9d/T5s7Ytcg0EK1Vqeo0YLCROVv+JnDAWGmDG7EWEoAYmWDE7PRKVjx8SzHIrQ9hI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744945200; c=relaxed/simple; bh=hTwiBRcB10QL+oWMMGu++FGbFMCh/YAYbdSp5Hxv3HY=; h=Date:Message-Id:In-Reply-To:References:From:Subject:To; b=QaxEzNCC6+6B+kTSiUi/wXpQBgjiHYI+pgvT8VfUE0YqxR3fxM3lM1bMRkVO5UKQ3I2YbcW6lFYKVejfvo2Hp2EdaQkq9fEdgSvTPULMxHQEV19uFEBUUMP8XBlP5KkDDEBg+N+u+x+/cOuSX36/YyCUZdZIXXEacHOfCgHDBuA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au; spf=pass smtp.mailfrom=gondor.apana.org.au; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b=bWJji9Rb; arc=none smtp.client-ip=144.6.53.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gondor.apana.org.au Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=hmeau.com header.i=@hmeau.com header.b="bWJji9Rb" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=hmeau.com; s=formenos; h=To:Subject:From:References:In-Reply-To:Message-Id:Date:Sender: Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Vk4AQ9B/4RhliO+I8I8LQ7FoE0p8G3zJOspwra+LZMk=; b=bWJji9RbuO1iiMcK7mcvzMydvs RXocXZDGJqe+0y+vYDnleCQX+OoZx4s5XV0pCRaMz2KyejBvM9Abno7XWbNCYPAWo630Z+D6sDRND zg402lnpwhNTW6iOXN2mOXqJJvkk5uxdnqt2YUiAbxNNrr3YYSrn0pdoOffgk19EOWmp3rsrFFiJU GVZDpOAf6hnBp3weRg9VPwqs4UGYg76qJDe2UTU6LwIKCMmzMHSkPTXZgWWdiyvAK4rZzkeMCjcyS +6CuUvl0ouMXxYT/WgVDJ+NpK2RNaCPtwSwuDNJpCNgfPBnt7WUTdDpipj/3gDPd7Q3+TWCl+oqa6 dkny6IHw==; Received: from loth.rohan.me.apana.org.au ([192.168.167.2]) by formenos.hmeau.com with smtp (Exim 4.96 #2 (Debian)) id 1u5bxL-00Ge9N-05; Fri, 18 Apr 2025 10:59:56 +0800 Received: by loth.rohan.me.apana.org.au (sSMTP sendmail emulation); Fri, 18 Apr 2025 10:59:55 +0800 Date: Fri, 18 Apr 2025 10:59:55 +0800 Message-Id: In-Reply-To: References: From: Herbert Xu Subject: [v2 PATCH 33/67] crypto: arm/sha256-asm - Use API partial block handling To: Linux Crypto Mailing List Precedence: bulk X-Mailing-List: linux-crypto@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Use the Crypto API partial block handling. Signed-off-by: Herbert Xu --- arch/arm/crypto/sha256_glue.c | 46 ++++++++++++++--------------------- arch/arm/crypto/sha256_glue.h | 8 +----- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/arch/arm/crypto/sha256_glue.c b/arch/arm/crypto/sha256_glue.c index f85933fdec75..d04c4e6bae6d 100644 --- a/arch/arm/crypto/sha256_glue.c +++ b/arch/arm/crypto/sha256_glue.c @@ -10,58 +10,47 @@ * Author: Tim Chen */ +#include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include +#include +#include #include "sha256_glue.h" -asmlinkage void sha256_block_data_order(struct sha256_state *state, +asmlinkage void sha256_block_data_order(struct crypto_sha256_state *state, const u8 *data, int num_blks); -int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data, - unsigned int len) +static int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data, + unsigned int len) { /* make sure casting to sha256_block_fn() is safe */ - BUILD_BUG_ON(offsetof(struct sha256_state, state) != 0); + BUILD_BUG_ON(offsetof(struct crypto_sha256_state, state) != 0); - return sha256_base_do_update(desc, data, len, sha256_block_data_order); + return sha256_base_do_update_blocks(desc, data, len, + sha256_block_data_order); } -EXPORT_SYMBOL(crypto_sha256_arm_update); -static int crypto_sha256_arm_final(struct shash_desc *desc, u8 *out) +static int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data, + unsigned int len, u8 *out) { - sha256_base_do_finalize(desc, sha256_block_data_order); + sha256_base_do_finup(desc, data, len, sha256_block_data_order); return sha256_base_finish(desc, out); } -int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data, - unsigned int len, u8 *out) -{ - sha256_base_do_update(desc, data, len, sha256_block_data_order); - return crypto_sha256_arm_final(desc, out); -} -EXPORT_SYMBOL(crypto_sha256_arm_finup); - static struct shash_alg algs[] = { { .digestsize = SHA256_DIGEST_SIZE, .init = sha256_base_init, .update = crypto_sha256_arm_update, - .final = crypto_sha256_arm_final, .finup = crypto_sha256_arm_finup, - .descsize = sizeof(struct sha256_state), + .descsize = sizeof(struct crypto_sha256_state), .base = { .cra_name = "sha256", .cra_driver_name = "sha256-asm", .cra_priority = 150, + .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY | + CRYPTO_AHASH_ALG_FINUP_MAX, .cra_blocksize = SHA256_BLOCK_SIZE, .cra_module = THIS_MODULE, } @@ -69,13 +58,14 @@ static struct shash_alg algs[] = { { .digestsize = SHA224_DIGEST_SIZE, .init = sha224_base_init, .update = crypto_sha256_arm_update, - .final = crypto_sha256_arm_final, .finup = crypto_sha256_arm_finup, - .descsize = sizeof(struct sha256_state), + .descsize = sizeof(struct crypto_sha256_state), .base = { .cra_name = "sha224", .cra_driver_name = "sha224-asm", .cra_priority = 150, + .cra_flags = CRYPTO_AHASH_ALG_BLOCK_ONLY | + CRYPTO_AHASH_ALG_FINUP_MAX, .cra_blocksize = SHA224_BLOCK_SIZE, .cra_module = THIS_MODULE, } diff --git a/arch/arm/crypto/sha256_glue.h b/arch/arm/crypto/sha256_glue.h index 9f0d578bab5f..9881c9a115d1 100644 --- a/arch/arm/crypto/sha256_glue.h +++ b/arch/arm/crypto/sha256_glue.h @@ -2,14 +2,8 @@ #ifndef _CRYPTO_SHA256_GLUE_H #define _CRYPTO_SHA256_GLUE_H -#include +#include extern struct shash_alg sha256_neon_algs[2]; -int crypto_sha256_arm_update(struct shash_desc *desc, const u8 *data, - unsigned int len); - -int crypto_sha256_arm_finup(struct shash_desc *desc, const u8 *data, - unsigned int len, u8 *hash); - #endif /* _CRYPTO_SHA256_GLUE_H */