From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 08EE034FF62 for ; Thu, 6 Nov 2025 17:45:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762451120; cv=none; b=i7wrN9eySiWTyLSH6GUQahwykV2yRDFxp6H+Gtv5RUJBhK3pnQmkxSp9L1eMsgLRCmNeB4xUlfMlJ7RprkRzzy34Oa+chGeNNZsuiBcbmskR3hCAwIQtSDuLiKN9tONjLLZJVgoQLLFYS7s5hEdIfQLUEkbNF91iV8b6x8AMyQo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762451120; c=relaxed/simple; bh=k61MYFMMaFNORE143WuR8u8TMnZTQTMl3pAPZVZYr3U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YWv+7aCZCO63nFhKd8A552OOydyoif7i8XkfkLIwpvZ12RyPUsi3hh0AobVWlVRUtBLWFqrNbBsiHmsecCMqC1i70A0e1Cy5LTdEC1KGRGW3v9H7cVlpvpzkM68cZ8OCVTS50An8nVWq8BtE8DcL5/94cf7aZO+OGIX95Ry8gjc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Be2ed2QZ; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Be2ed2QZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1762451117; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=OUQdQwyIqZTzeJrYIiFd0wR4yxjGopoVQGhDss0o5hs=; b=Be2ed2QZmQQq1DbvvRtPP09mrnrTch3SDUuzFAoF18uCSkrRlRgNPKtcmcx4IfUro9lsWP oWft+BbrgVJrbrY+O9Wshm3LSfPRsI5SGZ5CRmjIPaBQ+EW97HD65aj5U1c5670eY55q1S Dlcx3bGCR3Mq8L4w4cLTwWEQM2iOBU4= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-116-75TfXcyxOSeENyVvi_n7fg-1; Thu, 06 Nov 2025 12:45:12 -0500 X-MC-Unique: 75TfXcyxOSeENyVvi_n7fg-1 X-Mimecast-MFC-AGG-ID: 75TfXcyxOSeENyVvi_n7fg_1762451110 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id CFF12193E8BA; Thu, 6 Nov 2025 17:45:09 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.6]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B66D41800875; Thu, 6 Nov 2025 17:45:05 +0000 (UTC) From: David Howells To: Herbert Xu Cc: David Howells , Eric Biggers , Luis Chamberlain , Petr Pavlu , Daniel Gomez , Sami Tolvanen , "Jason A . Donenfeld" , Ard Biesheuvel , Stephan Mueller , Lukas Wunner , Ignat Korchagin , linux-crypto@vger.kernel.org, keyrings@vger.kernel.org, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v7 1/8] crypto: Add support for shake256 through crypto_shash Date: Thu, 6 Nov 2025 17:44:45 +0000 Message-ID: <20251106174456.31818-2-dhowells@redhat.com> In-Reply-To: <20251106174456.31818-1-dhowells@redhat.com> References: <20251106174456.31818-1-dhowells@redhat.com> Precedence: bulk X-Mailing-List: linux-modules@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Add shake256 support to the SHA-3 crypto_sig module so that ML-DSA can use it. Signed-off-by: David Howells cc: Stephan Mueller cc: Eric Biggers cc: Jason A. Donenfeld cc: Ard Biesheuvel cc: Herbert Xu cc: linux-crypto@vger.kernel.org --- crypto/sha3.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/crypto/sha3.c b/crypto/sha3.c index 8f364979ec89..be1d18baee8d 100644 --- a/crypto/sha3.c +++ b/crypto/sha3.c @@ -9,6 +9,7 @@ #include #define SHA3_CTX(desc) ((struct sha3_ctx *)shash_desc_ctx(desc)) +#define SHAKE_CTX(desc) ((struct shake_ctx *)shash_desc_ctx(desc)) static int crypto_sha3_224_init(struct shash_desc *desc) { @@ -87,6 +88,36 @@ static int crypto_sha3_import_core(struct shash_desc *desc, const void *in) return 0; } +static int crypto_shake256_init(struct shash_desc *desc) +{ + shake256_init(SHAKE_CTX(desc)); + return 0; +} + +static int crypto_shake_update(struct shash_desc *desc, const u8 *data, + unsigned int len) +{ + shake_update(SHAKE_CTX(desc), data, len); + return 0; +} + +static int crypto_shake_final(struct shash_desc *desc, u8 *out) +{ + const struct shash_alg *alg = crypto_shash_alg(desc->tfm); + + shake_squeeze(SHAKE_CTX(desc), out, alg->digestsize); + return 0; +} + +static int crypto_shake256_digest(struct shash_desc *desc, + const u8 *data, unsigned int len, u8 *out) +{ + const struct shash_alg *alg = crypto_shash_alg(desc->tfm); + + shake256(data, len, out, alg->digestsize); + return 0; +} + static struct shash_alg algs[] = { { .digestsize = SHA3_224_DIGEST_SIZE, .init = crypto_sha3_224_init, @@ -139,6 +170,17 @@ static struct shash_alg algs[] = { { .base.cra_driver_name = "sha3-512-lib", .base.cra_blocksize = SHA3_512_BLOCK_SIZE, .base.cra_module = THIS_MODULE, +}, { + .digestsize = SHAKE256_DEFAULT_SIZE, + .init = crypto_shake256_init, + .update = crypto_shake_update, + .final = crypto_shake_final, + .digest = crypto_shake256_digest, + .descsize = sizeof(struct shake_ctx), + .base.cra_name = "shake256", + .base.cra_driver_name = "shake256-lib", + .base.cra_blocksize = SHAKE256_BLOCK_SIZE, + .base.cra_module = THIS_MODULE, } }; static int __init crypto_sha3_mod_init(void)