From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8E2EBC7115C for ; Wed, 25 Jun 2025 09:53:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=o4LWu6KozvZoQiXKZGQ6FjQNodQE/1qMGQqfJH1lrUg=; b=1yuwabwUVJs3yk0S8MbYaLXtGw lD2JYTDq4XqLv3l+MywCL6lfbcD57lPhyyYahWae3LftZ4VjDkznY1k0CA9JCDb/fjFXfI8s5FCTi f2hD/IUfIAdHOPUBbIGgAJGnzxYC+FHdmEY+ImtXJ9n2xsonnAW7U8HZCFM71rZuAzyUSYlggX7uB ngTnnqHX2mYYTKd/cy6Zly0MTraTXP1bbwXPN7FxOW5qvS+egyz4oQebL9ueU4b2M82HmEgo6xgyi q4iVOiQkP+pJwregqTK6cNm97TA+QwTm4+fmG4YutED1kzzFAAm0XK8iS2MLp6fbUyEIPreHpwxRU A9nTlIag==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUMp5-00000008D4s-2O5w; Wed, 25 Jun 2025 09:53:43 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUKHF-00000007lPt-1sAj; Wed, 25 Jun 2025 07:10:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=o4LWu6KozvZoQiXKZGQ6FjQNodQE/1qMGQqfJH1lrUg=; b=ocbaU3k91kA634sk5Gsd1nv8/x 7eWeBVjyHPv3LxjZ41Ri3mA/IOTOsmLQe7Z7RVU9CRQytAS3FeNbMNLqNBzV3HHx9Ck0MKgInDzv8 9Ts4HRu9dNo6SoyQA7OBEPK6ZPozw7ftuFBMFVIKVF114ZB1SVbfyj3iy9JOTTduxHr6ELMZEu3M2 x90QijplZQ5C3jtctUqzwgWw//PDl+g7xpaOr/DV/defY4sY5Yt++xMaF/q+cstyk30rNHA76FdS7 /1dRtrJIAZ9tnhL+oJsHx02JihmKmPlfXTiFrpYqqG43EFdY3KNO6Pi1EnbXUMYj9A4Ji5oAl07BT 7SJWlwCA==; Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUKHB-00000005ddI-0SKG; Wed, 25 Jun 2025 07:10:36 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 949124AFF0; Wed, 25 Jun 2025 07:10:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2662DC116B1; Wed, 25 Jun 2025 07:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750835431; bh=Zeed4/7J1MAgm4uZ7/OtehAGBMIbM4x8fqn9JGGd45g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MieT5Uj1Ihmp2UzLvUIECVvfhjk3XRQ+K6PX9V8lIBOWFnkgYKRzwd0E+mvcxKkHj 19idi9jXV7eRt+u/ctsOrGBbUX0KEZPV4Yqlr/wUuRLD5RXeNVnd3ztGGL0yDg4VZ3 NWARw2GjVQOG9URFFYU3D1CSUx3UZqvkFB6oXi8nQbOruRj4I+CF2PIa4gmuuYIh2s IBYHZ6Sq2S4J951FOW9I20ct1vHE6hNGWiYGsYgHVhfhGBtBde6iuHOBFNAko+e3pO sj2/YhXEbYitj7xuTJe6Pss/9dxrb6Sr79+OPLcr+Nz3u4AmjUc8Lgta+bpUxsbEVt gYFnuHNLcMl4w== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, Eric Biggers Subject: [PATCH 09/18] lib/crypto: sha256: Add sha224() and sha224_update() Date: Wed, 25 Jun 2025 00:08:10 -0700 Message-ID: <20250625070819.1496119-10-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250625070819.1496119-1-ebiggers@kernel.org> References: <20250625070819.1496119-1-ebiggers@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250625_081033_484898_B91F0982 X-CRM114-Status: GOOD ( 13.02 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add a one-shot SHA-224 computation function sha224(), for consistency with sha256(), sha384(), and sha512() which all already exist. Similarly, add sha224_update(). While for now it's identical to sha256_update(), omitting it makes the API harder to use since users have to "know" which functions are the same between SHA-224 and SHA-256. Also, this is a prerequisite for using different context types for each. Signed-off-by: Eric Biggers --- include/crypto/sha2.h | 10 ++++++++-- lib/crypto/sha256.c | 10 ++++++++++ lib/crypto/tests/sha224_kunit.c | 13 +------------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/include/crypto/sha2.h b/include/crypto/sha2.h index bb181b7996cdc..e31da0743a522 100644 --- a/include/crypto/sha2.h +++ b/include/crypto/sha2.h @@ -112,22 +112,28 @@ struct sha512_state { u64 state[SHA512_DIGEST_SIZE / 8]; u64 count[2]; u8 buf[SHA512_BLOCK_SIZE]; }; +void sha256_update(struct sha256_state *sctx, const u8 *data, size_t len); + static inline void sha224_init(struct sha256_state *sctx) { sha224_block_init(&sctx->ctx); } -/* Simply use sha256_update as it is equivalent to sha224_update. */ +static inline void sha224_update(struct sha256_state *sctx, + const u8 *data, size_t len) +{ + sha256_update(sctx, data, len); +} void sha224_final(struct sha256_state *sctx, u8 out[SHA224_DIGEST_SIZE]); +void sha224(const u8 *data, size_t len, u8 out[SHA224_DIGEST_SIZE]); static inline void sha256_init(struct sha256_state *sctx) { sha256_block_init(&sctx->ctx); } -void sha256_update(struct sha256_state *sctx, const u8 *data, size_t len); void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE]); void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE]); /* State for the SHA-512 (and SHA-384) compression function */ struct sha512_block_state { diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c index 573ccecbf48bf..ccaae70880166 100644 --- a/lib/crypto/sha256.c +++ b/lib/crypto/sha256.c @@ -68,10 +68,20 @@ void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE]) { __sha256_final(sctx, out, SHA256_DIGEST_SIZE); } EXPORT_SYMBOL(sha256_final); +void sha224(const u8 *data, size_t len, u8 out[SHA224_DIGEST_SIZE]) +{ + struct sha256_state sctx; + + sha224_init(&sctx); + sha224_update(&sctx, data, len); + sha224_final(&sctx, out); +} +EXPORT_SYMBOL(sha224); + void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE]) { struct sha256_state sctx; sha256_init(&sctx); diff --git a/lib/crypto/tests/sha224_kunit.c b/lib/crypto/tests/sha224_kunit.c index 5015861a55112..c484c1d4a2a5e 100644 --- a/lib/crypto/tests/sha224_kunit.c +++ b/lib/crypto/tests/sha224_kunit.c @@ -3,26 +3,15 @@ * Copyright 2025 Google LLC */ #include #include "sha224-testvecs.h" -/* TODO: add sha224() to the library itself */ -static inline void sha224(const u8 *data, size_t len, - u8 out[SHA224_DIGEST_SIZE]) -{ - struct sha256_state state; - - sha224_init(&state); - sha256_update(&state, data, len); - sha224_final(&state, out); -} - #define HASH sha224 #define HASH_CTX sha256_state #define HASH_SIZE SHA224_DIGEST_SIZE #define HASH_INIT sha224_init -#define HASH_UPDATE sha256_update +#define HASH_UPDATE sha224_update #define HASH_FINAL sha224_final #define HASH_TESTVECS sha224_testvecs /* TODO: add HMAC-SHA224 support to the library, then enable the tests for it */ #include "hash-test-template.h" -- 2.50.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 82111C7EE3A for ; Wed, 25 Jun 2025 09:53:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=QKSYhvzboWMITqnn6CUYUcWvxRNKnAZoF5JRLBgX+Pg=; b=IZw6CXjIrXbXay ChZdPC0ZWn3NrgM24kPpqiSi3a974TmOLvIQwkvZ/HHmzi1DlQpf5GSVxHEXAHWaQDVAj1cjkmutp /mnMRaP+tQX0dzkvJcsIoDml2DRnuabN1QP67OlGlU1jJO7fM4mDmGWIsZ9k2FiozwyN4pdM78tGl 2CTZxLB53LYsnNorOf5w/eZZPYBZMXxIOy/jmQgQGUQewv23fphGgDBb01tZwyq8lHrvyvS3NmVZT IShLz7Z14fJcugYpBkOLBPnKpg+vvEDgBv2bejwtmJZBHAEjvnlxvRp2ihVENI2adk+ci6EmCQGFU 224bd8GsWweytuBFhGuQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUMp7-00000008D6K-0IRN; Wed, 25 Jun 2025 09:53:45 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUKHF-00000007lPt-1sAj; Wed, 25 Jun 2025 07:10:37 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=o4LWu6KozvZoQiXKZGQ6FjQNodQE/1qMGQqfJH1lrUg=; b=ocbaU3k91kA634sk5Gsd1nv8/x 7eWeBVjyHPv3LxjZ41Ri3mA/IOTOsmLQe7Z7RVU9CRQytAS3FeNbMNLqNBzV3HHx9Ck0MKgInDzv8 9Ts4HRu9dNo6SoyQA7OBEPK6ZPozw7ftuFBMFVIKVF114ZB1SVbfyj3iy9JOTTduxHr6ELMZEu3M2 x90QijplZQ5C3jtctUqzwgWw//PDl+g7xpaOr/DV/defY4sY5Yt++xMaF/q+cstyk30rNHA76FdS7 /1dRtrJIAZ9tnhL+oJsHx02JihmKmPlfXTiFrpYqqG43EFdY3KNO6Pi1EnbXUMYj9A4Ji5oAl07BT 7SJWlwCA==; Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by desiato.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uUKHB-00000005ddI-0SKG; Wed, 25 Jun 2025 07:10:36 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 949124AFF0; Wed, 25 Jun 2025 07:10:31 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2662DC116B1; Wed, 25 Jun 2025 07:10:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1750835431; bh=Zeed4/7J1MAgm4uZ7/OtehAGBMIbM4x8fqn9JGGd45g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MieT5Uj1Ihmp2UzLvUIECVvfhjk3XRQ+K6PX9V8lIBOWFnkgYKRzwd0E+mvcxKkHj 19idi9jXV7eRt+u/ctsOrGBbUX0KEZPV4Yqlr/wUuRLD5RXeNVnd3ztGGL0yDg4VZ3 NWARw2GjVQOG9URFFYU3D1CSUx3UZqvkFB6oXi8nQbOruRj4I+CF2PIa4gmuuYIh2s IBYHZ6Sq2S4J951FOW9I20ct1vHE6hNGWiYGsYgHVhfhGBtBde6iuHOBFNAko+e3pO sj2/YhXEbYitj7xuTJe6Pss/9dxrb6Sr79+OPLcr+Nz3u4AmjUc8Lgta+bpUxsbEVt gYFnuHNLcMl4w== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, x86@kernel.org, Eric Biggers Subject: [PATCH 09/18] lib/crypto: sha256: Add sha224() and sha224_update() Date: Wed, 25 Jun 2025 00:08:10 -0700 Message-ID: <20250625070819.1496119-10-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.0 In-Reply-To: <20250625070819.1496119-1-ebiggers@kernel.org> References: <20250625070819.1496119-1-ebiggers@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250625_081033_484898_B91F0982 X-CRM114-Status: GOOD ( 13.02 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add a one-shot SHA-224 computation function sha224(), for consistency with sha256(), sha384(), and sha512() which all already exist. Similarly, add sha224_update(). While for now it's identical to sha256_update(), omitting it makes the API harder to use since users have to "know" which functions are the same between SHA-224 and SHA-256. Also, this is a prerequisite for using different context types for each. Signed-off-by: Eric Biggers --- include/crypto/sha2.h | 10 ++++++++-- lib/crypto/sha256.c | 10 ++++++++++ lib/crypto/tests/sha224_kunit.c | 13 +------------ 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/include/crypto/sha2.h b/include/crypto/sha2.h index bb181b7996cdc..e31da0743a522 100644 --- a/include/crypto/sha2.h +++ b/include/crypto/sha2.h @@ -112,22 +112,28 @@ struct sha512_state { u64 state[SHA512_DIGEST_SIZE / 8]; u64 count[2]; u8 buf[SHA512_BLOCK_SIZE]; }; +void sha256_update(struct sha256_state *sctx, const u8 *data, size_t len); + static inline void sha224_init(struct sha256_state *sctx) { sha224_block_init(&sctx->ctx); } -/* Simply use sha256_update as it is equivalent to sha224_update. */ +static inline void sha224_update(struct sha256_state *sctx, + const u8 *data, size_t len) +{ + sha256_update(sctx, data, len); +} void sha224_final(struct sha256_state *sctx, u8 out[SHA224_DIGEST_SIZE]); +void sha224(const u8 *data, size_t len, u8 out[SHA224_DIGEST_SIZE]); static inline void sha256_init(struct sha256_state *sctx) { sha256_block_init(&sctx->ctx); } -void sha256_update(struct sha256_state *sctx, const u8 *data, size_t len); void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE]); void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE]); /* State for the SHA-512 (and SHA-384) compression function */ struct sha512_block_state { diff --git a/lib/crypto/sha256.c b/lib/crypto/sha256.c index 573ccecbf48bf..ccaae70880166 100644 --- a/lib/crypto/sha256.c +++ b/lib/crypto/sha256.c @@ -68,10 +68,20 @@ void sha256_final(struct sha256_state *sctx, u8 out[SHA256_DIGEST_SIZE]) { __sha256_final(sctx, out, SHA256_DIGEST_SIZE); } EXPORT_SYMBOL(sha256_final); +void sha224(const u8 *data, size_t len, u8 out[SHA224_DIGEST_SIZE]) +{ + struct sha256_state sctx; + + sha224_init(&sctx); + sha224_update(&sctx, data, len); + sha224_final(&sctx, out); +} +EXPORT_SYMBOL(sha224); + void sha256(const u8 *data, size_t len, u8 out[SHA256_DIGEST_SIZE]) { struct sha256_state sctx; sha256_init(&sctx); diff --git a/lib/crypto/tests/sha224_kunit.c b/lib/crypto/tests/sha224_kunit.c index 5015861a55112..c484c1d4a2a5e 100644 --- a/lib/crypto/tests/sha224_kunit.c +++ b/lib/crypto/tests/sha224_kunit.c @@ -3,26 +3,15 @@ * Copyright 2025 Google LLC */ #include #include "sha224-testvecs.h" -/* TODO: add sha224() to the library itself */ -static inline void sha224(const u8 *data, size_t len, - u8 out[SHA224_DIGEST_SIZE]) -{ - struct sha256_state state; - - sha224_init(&state); - sha256_update(&state, data, len); - sha224_final(&state, out); -} - #define HASH sha224 #define HASH_CTX sha256_state #define HASH_SIZE SHA224_DIGEST_SIZE #define HASH_INIT sha224_init -#define HASH_UPDATE sha256_update +#define HASH_UPDATE sha224_update #define HASH_FINAL sha224_final #define HASH_TESTVECS sha224_testvecs /* TODO: add HMAC-SHA224 support to the library, then enable the tests for it */ #include "hash-test-template.h" -- 2.50.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv