From nobody Fri Oct 3 11:22:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 022B22EC083; Mon, 1 Sep 2025 16:52:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; cv=none; b=u4LQUPdodyGdjm5Lkz9UWc83c5Jf0vr/1tsOgyA/GfMoJiO/VW9Ts1IXyIvkoYPdAsJRqAD82mU66bMzD9roabo6o4Qe68gDyp6680TUVHAKPp/Dnv5+8lXIFAwu+JLKzQ1x3J6qlSWC7XBWPPLnA1pKv6GIpUsj/0nfi396s/0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; c=relaxed/simple; bh=XFff4ztVNM7A2DSEz/0F1H8morLJnpt2FM2EP8GGFrU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oeQCwxrm4VcRsszyYXGDyIaYQ6Zryi0jwXYEAawkLpWrzjfABbVlzCr08OqyjdxtVnzL5v2VpTNm//f/0tF6eoVaV0RYkQtqCnX3u3ir669fO5oNcIdbh7kGl4n2EIyZcnimHSgcR84t+BinRliFWOYDqVdM9pmnPs6HxiC9Sq8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t6wMPqlm; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="t6wMPqlm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6F928C4CEF1; Mon, 1 Sep 2025 16:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756745559; bh=XFff4ztVNM7A2DSEz/0F1H8morLJnpt2FM2EP8GGFrU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t6wMPqlmRWjBKxVvkAx/vHDcUfas7mJMf2Ap1GW85rSZbftX8+lA6yVGq7uTEztaK NeYakRRvZ5bAZ9F3Fk1kxizo9UGaZcAgE8T8zrCgV+MOYYsQjl4n547Hix2iw5JxEK shYpbOCM2/FgzdJyfpyizDzbe9YYYCTxi402D46BLOwjGLqdXNh/MZw/ak7oMZu7oF E/ig2fA9HCBCHaXOwwceLsgXLoHPuEEY6yihoyqO8zXpgxkdUmWUOqJOipzT38B2CL G2elLwJ9+ME82kWgdJQ56SStjoxoDJ2L7OnM8oRm+pLmzP193ROwQ5u1rMnGBmYNRG yHNkYjoauRQjg== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , qat-linux@intel.com, Giovanni Cabiddu , Ovidiu Panait , Eric Biggers Subject: [PATCH 1/3] crypto: sha1 - Implement export_core() and import_core() Date: Mon, 1 Sep 2025 09:50:11 -0700 Message-ID: <20250901165013.48649-2-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250901165013.48649-1-ebiggers@kernel.org> References: <20250901165013.48649-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 9d7a0ab1c753 ("crypto: ahash - Handle partial blocks in API"), the recently-added export_core() and import_core() methods in struct shash_alg have effectively become mandatory (even though it is not tested or enforced), since legacy drivers that need a fallback depend on them. Make crypto/sha1.c compatible with these legacy drivers by adding export_core() and import_core() methods to it. Reported-by: Giovanni Cabiddu Reported-by: Ovidiu Panait Closes: https://lore.kernel.org/r/aLSnCc9Ws5L9y+8X@gcabiddu-mobl.ger.corp.i= ntel.com Fixes: b10a74abcfc5 ("crypto: sha1 - Use same state format as legacy driver= s") Signed-off-by: Eric Biggers Tested-by: Giovanni Cabiddu Tested-by: Ovidiu Panait --- crypto/sha1.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/crypto/sha1.c b/crypto/sha1.c index ecef4bf2d9c00..4fbf61cf03709 100644 --- a/crypto/sha1.c +++ b/crypto/sha1.c @@ -47,10 +47,22 @@ static int __crypto_sha1_import(struct sha1_ctx *ctx, c= onst void *in) p +=3D sizeof(*ctx); ctx->bytecount +=3D *p; return 0; } =20 +static int __crypto_sha1_export_core(const struct sha1_ctx *ctx, void *out) +{ + memcpy(out, ctx, offsetof(struct sha1_ctx, buf)); + return 0; +} + +static int __crypto_sha1_import_core(struct sha1_ctx *ctx, const void *in) +{ + memcpy(ctx, in, offsetof(struct sha1_ctx, buf)); + return 0; +} + const u8 sha1_zero_message_hash[SHA1_DIGEST_SIZE] =3D { 0xda, 0x39, 0xa3, 0xee, 0x5e, 0x6b, 0x4b, 0x0d, 0x32, 0x55, 0xbf, 0xef, 0x95, 0x60, 0x18, 0x90, 0xaf, 0xd8, 0x07, 0x09 }; @@ -92,10 +104,20 @@ static int crypto_sha1_export(struct shash_desc *desc,= void *out) static int crypto_sha1_import(struct shash_desc *desc, const void *in) { return __crypto_sha1_import(SHA1_CTX(desc), in); } =20 +static int crypto_sha1_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha1_export_core(SHA1_CTX(desc), out); +} + +static int crypto_sha1_import_core(struct shash_desc *desc, const void *in) +{ + return __crypto_sha1_import_core(SHA1_CTX(desc), in); +} + #define HMAC_SHA1_KEY(tfm) ((struct hmac_sha1_key *)crypto_shash_ctx(tfm)) #define HMAC_SHA1_CTX(desc) ((struct hmac_sha1_ctx *)shash_desc_ctx(desc)) =20 static int crypto_hmac_sha1_setkey(struct crypto_shash *tfm, const u8 *raw_key, unsigned int keylen) @@ -141,10 +163,23 @@ static int crypto_hmac_sha1_import(struct shash_desc = *desc, const void *in) =20 ctx->ostate =3D HMAC_SHA1_KEY(desc->tfm)->ostate; return __crypto_sha1_import(&ctx->sha_ctx, in); } =20 +static int crypto_hmac_sha1_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha1_export_core(&HMAC_SHA1_CTX(desc)->sha_ctx, out); +} + +static int crypto_hmac_sha1_import_core(struct shash_desc *desc, const voi= d *in) +{ + struct hmac_sha1_ctx *ctx =3D HMAC_SHA1_CTX(desc); + + ctx->ostate =3D HMAC_SHA1_KEY(desc->tfm)->ostate; + return __crypto_sha1_import_core(&ctx->sha_ctx, in); +} + static struct shash_alg algs[] =3D { { .base.cra_name =3D "sha1", .base.cra_driver_name =3D "sha1-lib", .base.cra_priority =3D 300, @@ -155,10 +190,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_sha1_update, .final =3D crypto_sha1_final, .digest =3D crypto_sha1_digest, .export =3D crypto_sha1_export, .import =3D crypto_sha1_import, + .export_core =3D crypto_sha1_export_core, + .import_core =3D crypto_sha1_import_core, .descsize =3D sizeof(struct sha1_ctx), .statesize =3D SHA1_SHASH_STATE_SIZE, }, { .base.cra_name =3D "hmac(sha1)", @@ -173,10 +210,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_hmac_sha1_update, .final =3D crypto_hmac_sha1_final, .digest =3D crypto_hmac_sha1_digest, .export =3D crypto_hmac_sha1_export, .import =3D crypto_hmac_sha1_import, + .export_core =3D crypto_hmac_sha1_export_core, + .import_core =3D crypto_hmac_sha1_import_core, .descsize =3D sizeof(struct hmac_sha1_ctx), .statesize =3D SHA1_SHASH_STATE_SIZE, }, }; =20 --=20 2.50.1 From nobody Fri Oct 3 11:22:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 8160E30C36C; Mon, 1 Sep 2025 16:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; cv=none; b=dkxuoKY0GSlziMClzfiuJbrQeB5Xqlv2cz0PtLvJMZ2h6aL2RlqrPY0tKxbHOC8KvVSPjp1dzGWB01DM0vYwYmtVPHXv4PQqbeaIByyNf5TD+1fK2fDCKPG2InDUstxBsk+llgZqVvBr1yfPVjwrtjOlOEkfMUCtgk0hNnSgU3o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; c=relaxed/simple; bh=QuU468Jvbl/uNqnPkAm2+dsVpZFhcNVq9FG/MzFDUic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XJkJgcVaBNX/c30T2Nd5OQz9iE3pL1BTtx14rn/gF5eAVlM5PUNzcKGZxODirysm7wtbzgrO2pKQXQxmGt0b/gtEDI6Gjjv2JASpUkk9k1y67jzfm7lBrFzl1RYibZ1ubuTFxR85CnGN/Qy3Bo2a04Tn1dFkNGb6dg1ScraGhXA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RYnuWhSA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RYnuWhSA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C8E81C4CEF4; Mon, 1 Sep 2025 16:52:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756745560; bh=QuU468Jvbl/uNqnPkAm2+dsVpZFhcNVq9FG/MzFDUic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RYnuWhSAbv10enSoDIiyC0C2cd60DSGc67JXd5C//tLtW55hrGMYJ2mG7sQPODa5Z blsA8xepRs5RcRlKV4tz6REFR5YBTKwSAGKVeS7QnZXzj1NU+JhcRXvbxPN4Lm1FY/ UlSxYz/G1yZxrbJno/iCcTqd0mHuYKs7kZM+tdlIAhVaxFWpPRkPmLVxA5HsOAJrFB 49blsTSoHqkno51hH2ORFSonu2LK5dM6Tr6llmsMjToDAX6YetxYM1AGCJzILsnfZ4 I5vb71ucxBTdyMSUbid5nAITDpOmEE0OdGf7DVdcf2aPfVozXzt47whzl86dK9h2vm 8y4cII+xpqEkw== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , qat-linux@intel.com, Giovanni Cabiddu , Ovidiu Panait , Eric Biggers Subject: [PATCH 2/3] crypto: sha256 - Implement export_core() and import_core() Date: Mon, 1 Sep 2025 09:50:12 -0700 Message-ID: <20250901165013.48649-3-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250901165013.48649-1-ebiggers@kernel.org> References: <20250901165013.48649-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 9d7a0ab1c753 ("crypto: ahash - Handle partial blocks in API"), the recently-added export_core() and import_core() methods in struct shash_alg have effectively become mandatory (even though it is not tested or enforced), since legacy drivers that need a fallback depend on them. Make crypto/sha256.c compatible with these legacy drivers by adding export_core() and import_core() methods to it. Reported-by: Giovanni Cabiddu Reported-by: Ovidiu Panait Closes: https://lore.kernel.org/r/aLSnCc9Ws5L9y+8X@gcabiddu-mobl.ger.corp.i= ntel.com Fixes: 07f090959bba ("crypto: sha256 - Use same state format as legacy driv= ers") Signed-off-by: Eric Biggers Tested-by: Giovanni Cabiddu Tested-by: Ovidiu Panait --- crypto/sha256.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/crypto/sha256.c b/crypto/sha256.c index 052806559f06c..fb81defe084c6 100644 --- a/crypto/sha256.c +++ b/crypto/sha256.c @@ -48,10 +48,23 @@ static int __crypto_sha256_import(struct __sha256_ctx *= ctx, const void *in) p +=3D sizeof(*ctx); ctx->bytecount +=3D *p; return 0; } =20 +static int __crypto_sha256_export_core(const struct __sha256_ctx *ctx, + void *out) +{ + memcpy(out, ctx, offsetof(struct __sha256_ctx, buf)); + return 0; +} + +static int __crypto_sha256_import_core(struct __sha256_ctx *ctx, const voi= d *in) +{ + memcpy(ctx, in, offsetof(struct __sha256_ctx, buf)); + return 0; +} + /* SHA-224 */ =20 const u8 sha224_zero_message_hash[SHA224_DIGEST_SIZE] =3D { 0xd1, 0x4a, 0x02, 0x8c, 0x2a, 0x3a, 0x2b, 0xc9, 0x47, 0x61, 0x02, 0xbb, 0x28, 0x82, 0x34, 0xc4, 0x15, 0xa2, @@ -96,10 +109,20 @@ static int crypto_sha224_export(struct shash_desc *des= c, void *out) static int crypto_sha224_import(struct shash_desc *desc, const void *in) { return __crypto_sha256_import(&SHA224_CTX(desc)->ctx, in); } =20 +static int crypto_sha224_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha256_export_core(&SHA224_CTX(desc)->ctx, out); +} + +static int crypto_sha224_import_core(struct shash_desc *desc, const void *= in) +{ + return __crypto_sha256_import_core(&SHA224_CTX(desc)->ctx, in); +} + /* SHA-256 */ =20 const u8 sha256_zero_message_hash[SHA256_DIGEST_SIZE] =3D { 0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, @@ -144,10 +167,20 @@ static int crypto_sha256_export(struct shash_desc *de= sc, void *out) static int crypto_sha256_import(struct shash_desc *desc, const void *in) { return __crypto_sha256_import(&SHA256_CTX(desc)->ctx, in); } =20 +static int crypto_sha256_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha256_export_core(&SHA256_CTX(desc)->ctx, out); +} + +static int crypto_sha256_import_core(struct shash_desc *desc, const void *= in) +{ + return __crypto_sha256_import_core(&SHA256_CTX(desc)->ctx, in); +} + /* HMAC-SHA224 */ =20 #define HMAC_SHA224_KEY(tfm) ((struct hmac_sha224_key *)crypto_shash_ctx(t= fm)) #define HMAC_SHA224_CTX(desc) ((struct hmac_sha224_ctx *)shash_desc_ctx(de= sc)) =20 @@ -196,10 +229,25 @@ static int crypto_hmac_sha224_import(struct shash_des= c *desc, const void *in) =20 ctx->ctx.ostate =3D HMAC_SHA224_KEY(desc->tfm)->key.ostate; return __crypto_sha256_import(&ctx->ctx.sha_ctx, in); } =20 +static int crypto_hmac_sha224_export_core(struct shash_desc *desc, void *o= ut) +{ + return __crypto_sha256_export_core(&HMAC_SHA224_CTX(desc)->ctx.sha_ctx, + out); +} + +static int crypto_hmac_sha224_import_core(struct shash_desc *desc, + const void *in) +{ + struct hmac_sha224_ctx *ctx =3D HMAC_SHA224_CTX(desc); + + ctx->ctx.ostate =3D HMAC_SHA224_KEY(desc->tfm)->key.ostate; + return __crypto_sha256_import_core(&ctx->ctx.sha_ctx, in); +} + /* HMAC-SHA256 */ =20 #define HMAC_SHA256_KEY(tfm) ((struct hmac_sha256_key *)crypto_shash_ctx(t= fm)) #define HMAC_SHA256_CTX(desc) ((struct hmac_sha256_ctx *)shash_desc_ctx(de= sc)) =20 @@ -248,10 +296,25 @@ static int crypto_hmac_sha256_import(struct shash_des= c *desc, const void *in) =20 ctx->ctx.ostate =3D HMAC_SHA256_KEY(desc->tfm)->key.ostate; return __crypto_sha256_import(&ctx->ctx.sha_ctx, in); } =20 +static int crypto_hmac_sha256_export_core(struct shash_desc *desc, void *o= ut) +{ + return __crypto_sha256_export_core(&HMAC_SHA256_CTX(desc)->ctx.sha_ctx, + out); +} + +static int crypto_hmac_sha256_import_core(struct shash_desc *desc, + const void *in) +{ + struct hmac_sha256_ctx *ctx =3D HMAC_SHA256_CTX(desc); + + ctx->ctx.ostate =3D HMAC_SHA256_KEY(desc->tfm)->key.ostate; + return __crypto_sha256_import_core(&ctx->ctx.sha_ctx, in); +} + /* Algorithm definitions */ =20 static struct shash_alg algs[] =3D { { .base.cra_name =3D "sha224", @@ -264,10 +327,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_sha224_update, .final =3D crypto_sha224_final, .digest =3D crypto_sha224_digest, .export =3D crypto_sha224_export, .import =3D crypto_sha224_import, + .export_core =3D crypto_sha224_export_core, + .import_core =3D crypto_sha224_import_core, .descsize =3D sizeof(struct sha224_ctx), .statesize =3D SHA256_SHASH_STATE_SIZE, }, { .base.cra_name =3D "sha256", @@ -280,10 +345,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_sha256_update, .final =3D crypto_sha256_final, .digest =3D crypto_sha256_digest, .export =3D crypto_sha256_export, .import =3D crypto_sha256_import, + .export_core =3D crypto_sha256_export_core, + .import_core =3D crypto_sha256_import_core, .descsize =3D sizeof(struct sha256_ctx), .statesize =3D SHA256_SHASH_STATE_SIZE, }, { .base.cra_name =3D "hmac(sha224)", @@ -298,10 +365,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_hmac_sha224_update, .final =3D crypto_hmac_sha224_final, .digest =3D crypto_hmac_sha224_digest, .export =3D crypto_hmac_sha224_export, .import =3D crypto_hmac_sha224_import, + .export_core =3D crypto_hmac_sha224_export_core, + .import_core =3D crypto_hmac_sha224_import_core, .descsize =3D sizeof(struct hmac_sha224_ctx), .statesize =3D SHA256_SHASH_STATE_SIZE, }, { .base.cra_name =3D "hmac(sha256)", @@ -316,10 +385,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_hmac_sha256_update, .final =3D crypto_hmac_sha256_final, .digest =3D crypto_hmac_sha256_digest, .export =3D crypto_hmac_sha256_export, .import =3D crypto_hmac_sha256_import, + .export_core =3D crypto_hmac_sha256_export_core, + .import_core =3D crypto_hmac_sha256_import_core, .descsize =3D sizeof(struct hmac_sha256_ctx), .statesize =3D SHA256_SHASH_STATE_SIZE, }, }; =20 --=20 2.50.1 From nobody Fri Oct 3 11:22:29 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C9CA53128D6; Mon, 1 Sep 2025 16:52:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; cv=none; b=biXLpKwGNL+8oSrbeIUIW9l/yeol8nz6uBKHzBBmycLPbjw8iy1Bp0ITAkaVi45Z/ii5UWz76qUz71vejdC3X6VMl3Jc9ErEtBRBluANuQB+KgnOcCeXSaX70WAtoIaRIvpp8Uz+f9o9/EOqW/lvSHsoEouveuMu/vZNnUz12wE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756745560; c=relaxed/simple; bh=BFnBbraOCacTgsat4VNzLx3wIcLl5nbM95+AHTdP3Hc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mSfQQEdcwzsBVN0aAAJP/DBzAo2Sawr84uQtbH72w1shyA5U2pJAEbRY3Tv1pD9YGC0zOurWsyAGQKKEvmk9eNGT7+pC058O8zO4HUtuDCQrG+0Hs0A8kXFAOYROuTZUXAl517SeRM93CtN2sb0tE7IyRRVsEYjDMSVSZM7UCd0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pgaSIIbJ; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pgaSIIbJ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E2FDC4CEF1; Mon, 1 Sep 2025 16:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1756745560; bh=BFnBbraOCacTgsat4VNzLx3wIcLl5nbM95+AHTdP3Hc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pgaSIIbJXnOTds5upAgyOGSLpTsayVHNwR2jip8DUB7QKUhF5AZiipmakyvV95EoX KHf/lSBet2gthLiaGRRONcSdZ/fCCqhHVAWlRhWKQcci8fJgxtY9tfRHUX528fWpNG TIOTOYot99i0iLe4bBhzPWIRYysPlMNB6lvAR3bZNeNC8Vw3PU/WnNXp7wKsUpvlu0 6JyHT01IaMmNHKjxHu5XDMRqIcn73Drs/WJkcBWmyiePWS+KVljXOVdNmGFllByFMw BYWqj0OuvLTmvsEiCnSHVnBDu/4Ml7QMCd+hHDul5AAq/UtKWV83keQ67IWSWgh8Ao UJn4rM+3OZcCw== From: Eric Biggers To: linux-crypto@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , "Jason A . Donenfeld" , qat-linux@intel.com, Giovanni Cabiddu , Ovidiu Panait , Eric Biggers Subject: [PATCH 3/3] crypto: sha512 - Implement export_core() and import_core() Date: Mon, 1 Sep 2025 09:50:13 -0700 Message-ID: <20250901165013.48649-4-ebiggers@kernel.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250901165013.48649-1-ebiggers@kernel.org> References: <20250901165013.48649-1-ebiggers@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit 9d7a0ab1c753 ("crypto: ahash - Handle partial blocks in API"), the recently-added export_core() and import_core() methods in struct shash_alg have effectively become mandatory (even though it is not tested or enforced), since legacy drivers that need a fallback depend on them. Make crypto/sha512.c compatible with these legacy drivers by adding export_core() and import_core() methods to it. Reported-by: Giovanni Cabiddu Reported-by: Ovidiu Panait Closes: https://lore.kernel.org/r/aLSnCc9Ws5L9y+8X@gcabiddu-mobl.ger.corp.i= ntel.com Fixes: 4bc7f7b687a2 ("crypto: sha512 - Use same state format as legacy driv= ers") Signed-off-by: Eric Biggers Tested-by: Giovanni Cabiddu Tested-by: Ovidiu Panait --- crypto/sha512.c | 71 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/crypto/sha512.c b/crypto/sha512.c index fb1c520978ef3..d320fe53913fa 100644 --- a/crypto/sha512.c +++ b/crypto/sha512.c @@ -48,10 +48,23 @@ static int __crypto_sha512_import(struct __sha512_ctx *= ctx, const void *in) p +=3D sizeof(*ctx); ctx->bytecount_lo +=3D *p; return 0; } =20 +static int __crypto_sha512_export_core(const struct __sha512_ctx *ctx, + void *out) +{ + memcpy(out, ctx, offsetof(struct __sha512_ctx, buf)); + return 0; +} + +static int __crypto_sha512_import_core(struct __sha512_ctx *ctx, const voi= d *in) +{ + memcpy(ctx, in, offsetof(struct __sha512_ctx, buf)); + return 0; +} + /* SHA-384 */ =20 const u8 sha384_zero_message_hash[SHA384_DIGEST_SIZE] =3D { 0x38, 0xb0, 0x60, 0xa7, 0x51, 0xac, 0x96, 0x38, 0x4c, 0xd9, 0x32, 0x7e, 0xb1, 0xb1, 0xe3, 0x6a, @@ -98,10 +111,20 @@ static int crypto_sha384_export(struct shash_desc *des= c, void *out) static int crypto_sha384_import(struct shash_desc *desc, const void *in) { return __crypto_sha512_import(&SHA384_CTX(desc)->ctx, in); } =20 +static int crypto_sha384_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha512_export_core(&SHA384_CTX(desc)->ctx, out); +} + +static int crypto_sha384_import_core(struct shash_desc *desc, const void *= in) +{ + return __crypto_sha512_import_core(&SHA384_CTX(desc)->ctx, in); +} + /* SHA-512 */ =20 const u8 sha512_zero_message_hash[SHA512_DIGEST_SIZE] =3D { 0xcf, 0x83, 0xe1, 0x35, 0x7e, 0xef, 0xb8, 0xbd, 0xf1, 0x54, 0x28, 0x50, 0xd6, 0x6d, 0x80, 0x07, @@ -150,10 +173,20 @@ static int crypto_sha512_export(struct shash_desc *de= sc, void *out) static int crypto_sha512_import(struct shash_desc *desc, const void *in) { return __crypto_sha512_import(&SHA512_CTX(desc)->ctx, in); } =20 +static int crypto_sha512_export_core(struct shash_desc *desc, void *out) +{ + return __crypto_sha512_export_core(&SHA512_CTX(desc)->ctx, out); +} + +static int crypto_sha512_import_core(struct shash_desc *desc, const void *= in) +{ + return __crypto_sha512_import_core(&SHA512_CTX(desc)->ctx, in); +} + /* HMAC-SHA384 */ =20 #define HMAC_SHA384_KEY(tfm) ((struct hmac_sha384_key *)crypto_shash_ctx(t= fm)) #define HMAC_SHA384_CTX(desc) ((struct hmac_sha384_ctx *)shash_desc_ctx(de= sc)) =20 @@ -202,10 +235,25 @@ static int crypto_hmac_sha384_import(struct shash_des= c *desc, const void *in) =20 ctx->ctx.ostate =3D HMAC_SHA384_KEY(desc->tfm)->key.ostate; return __crypto_sha512_import(&ctx->ctx.sha_ctx, in); } =20 +static int crypto_hmac_sha384_export_core(struct shash_desc *desc, void *o= ut) +{ + return __crypto_sha512_export_core(&HMAC_SHA384_CTX(desc)->ctx.sha_ctx, + out); +} + +static int crypto_hmac_sha384_import_core(struct shash_desc *desc, + const void *in) +{ + struct hmac_sha384_ctx *ctx =3D HMAC_SHA384_CTX(desc); + + ctx->ctx.ostate =3D HMAC_SHA384_KEY(desc->tfm)->key.ostate; + return __crypto_sha512_import_core(&ctx->ctx.sha_ctx, in); +} + /* HMAC-SHA512 */ =20 #define HMAC_SHA512_KEY(tfm) ((struct hmac_sha512_key *)crypto_shash_ctx(t= fm)) #define HMAC_SHA512_CTX(desc) ((struct hmac_sha512_ctx *)shash_desc_ctx(de= sc)) =20 @@ -254,10 +302,25 @@ static int crypto_hmac_sha512_import(struct shash_des= c *desc, const void *in) =20 ctx->ctx.ostate =3D HMAC_SHA512_KEY(desc->tfm)->key.ostate; return __crypto_sha512_import(&ctx->ctx.sha_ctx, in); } =20 +static int crypto_hmac_sha512_export_core(struct shash_desc *desc, void *o= ut) +{ + return __crypto_sha512_export_core(&HMAC_SHA512_CTX(desc)->ctx.sha_ctx, + out); +} + +static int crypto_hmac_sha512_import_core(struct shash_desc *desc, + const void *in) +{ + struct hmac_sha512_ctx *ctx =3D HMAC_SHA512_CTX(desc); + + ctx->ctx.ostate =3D HMAC_SHA512_KEY(desc->tfm)->key.ostate; + return __crypto_sha512_import_core(&ctx->ctx.sha_ctx, in); +} + /* Algorithm definitions */ =20 static struct shash_alg algs[] =3D { { .base.cra_name =3D "sha384", @@ -270,10 +333,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_sha384_update, .final =3D crypto_sha384_final, .digest =3D crypto_sha384_digest, .export =3D crypto_sha384_export, .import =3D crypto_sha384_import, + .export_core =3D crypto_sha384_export_core, + .import_core =3D crypto_sha384_import_core, .descsize =3D sizeof(struct sha384_ctx), .statesize =3D SHA512_SHASH_STATE_SIZE, }, { .base.cra_name =3D "sha512", @@ -286,10 +351,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_sha512_update, .final =3D crypto_sha512_final, .digest =3D crypto_sha512_digest, .export =3D crypto_sha512_export, .import =3D crypto_sha512_import, + .export_core =3D crypto_sha512_export_core, + .import_core =3D crypto_sha512_import_core, .descsize =3D sizeof(struct sha512_ctx), .statesize =3D SHA512_SHASH_STATE_SIZE, }, { .base.cra_name =3D "hmac(sha384)", @@ -304,10 +371,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_hmac_sha384_update, .final =3D crypto_hmac_sha384_final, .digest =3D crypto_hmac_sha384_digest, .export =3D crypto_hmac_sha384_export, .import =3D crypto_hmac_sha384_import, + .export_core =3D crypto_hmac_sha384_export_core, + .import_core =3D crypto_hmac_sha384_import_core, .descsize =3D sizeof(struct hmac_sha384_ctx), .statesize =3D SHA512_SHASH_STATE_SIZE, }, { .base.cra_name =3D "hmac(sha512)", @@ -322,10 +391,12 @@ static struct shash_alg algs[] =3D { .update =3D crypto_hmac_sha512_update, .final =3D crypto_hmac_sha512_final, .digest =3D crypto_hmac_sha512_digest, .export =3D crypto_hmac_sha512_export, .import =3D crypto_hmac_sha512_import, + .export_core =3D crypto_hmac_sha512_export_core, + .import_core =3D crypto_hmac_sha512_import_core, .descsize =3D sizeof(struct hmac_sha512_ctx), .statesize =3D SHA512_SHASH_STATE_SIZE, }, }; =20 --=20 2.50.1