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 82463EDF021 for ; Thu, 12 Feb 2026 02:52:01 +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-Type: Content-Transfer-Encoding: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=oGjvxsaA2vMvrrtkyZwsViNZnq7rh42dZCtGNwpCGCU=; b=0oObcQsT3ahvW/ee7742FYKXO/ a9JHm9/9h+oVmDV/OMM2qqmoT0zpkZLwzUKbIyLrVEKzK3QX+Bvr4vi9peuvVdWrQCkJOEblwuYCn tV8+3fNGdmszr2ZbYxx4T/dAfNnmMCzrtYAobOUrUSQEXysElXi5LsYYLc/O/Ek1p125iE+jRjU7m ZRIVjDaQYN44DA4d77u9Qruyu1rxflmC7ZlpdJoLfjuwukn4V4Wa5kcpMLOdT0KaO0pWirYqSrQg5 7SzDvNf+BVkf7gANcDMqQM8oFssHr33QWLMEXKvjhtjOS9SYOc+bsvpmpKJ5tAdbXtYMa7UCOmbpA q32PEcCQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vqMo6-00000001Nq3-2lyG; Thu, 12 Feb 2026 02:51:54 +0000 Received: from pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com ([44.246.1.125]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vqMo3-00000001Nob-3cle for linux-arm-kernel@lists.infradead.org; Thu, 12 Feb 2026 02:51:53 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazoncorp2; t=1770864711; x=1802400711; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=oGjvxsaA2vMvrrtkyZwsViNZnq7rh42dZCtGNwpCGCU=; b=CVdZcozcsZyQlCM5ARCqIfyuAUcHJoo9Zdaino+Wi6JIbxdWezh5fQX0 IRVpWDYMLQurUMhhifGM7VQTmzdKhTTz17AvcNDqaBi7+JoV9dcgRRzfR nGkQk+xmJhn97gJDRZdTzpHNw6KBDOZYeGAfdxxTn6FpTR+B9YiX6nZTv W0pPW2OiLaH8ponFyizF11Eim/5GcZKkDGe3iAWpE7NQgym/UP1ryisxV uL+IKqjINNnpRdTqzAV3LsKz62CeTx0CdkvceXqXvHdvMJ6EhjpbI1l9U Gln9orzvD3FkHQtC2acWsD2l7V8LDtf79R4k2Jx45PQbkO841W72Ft3sb g==; X-CSE-ConnectionGUID: GEai6Ol8Qlmp9sOo0rlI4w== X-CSE-MsgGUID: jS9CDnEDS2CWR4YJYbFiOA== X-IronPort-AV: E=Sophos;i="6.21,285,1763424000"; d="scan'208";a="12918699" Received: from ip-10-5-6-203.us-west-2.compute.internal (HELO smtpout.naws.us-west-2.prod.farcaster.email.amazon.dev) ([10.5.6.203]) by internal-pdx-out-002.esa.us-west-2.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Feb 2026 02:51:51 +0000 Received: from EX19MTAUWA001.ant.amazon.com [205.251.233.236:21475] by smtpin.naws.us-west-2.prod.farcaster.email.amazon.dev [10.0.0.85:2525] with esmtp (Farcaster) id bf2c3f47-f2af-44fa-910c-1b92b27d91e8; Thu, 12 Feb 2026 02:51:50 +0000 (UTC) X-Farcaster-Flow-ID: bf2c3f47-f2af-44fa-910c-1b92b27d91e8 Received: from EX19D001UWA001.ant.amazon.com (10.13.138.214) by EX19MTAUWA001.ant.amazon.com (10.250.64.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 12 Feb 2026 02:51:50 +0000 Received: from dev-dsk-wanjay-2c-d25651b4.us-west-2.amazon.com (172.19.198.4) by EX19D001UWA001.ant.amazon.com (10.13.138.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.35; Thu, 12 Feb 2026 02:51:50 +0000 From: Jay Wang To: Herbert Xu , "David S . Miller" , CC: Jay Wang , Vegard Nossum , Nicolai Stange , Ilia Okomin , Catalin Marinas , "Will Deacon" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Luis Chamberlain , Petr Pavlu , Nathan Chancellor , Nicolas Schier , , , , Subject: [PATCH 017/106] crypto: convert exported crypto symbol into pluggable interface for CONFIG_CRYPTO_MD5 crypto Date: Thu, 12 Feb 2026 02:45:53 +0000 Message-ID: <20260212024725.11264-18-wanjay@amazon.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260212024725.11264-1-wanjay@amazon.com> References: <20260212024725.11264-1-wanjay@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.19.198.4] X-ClientProxiedBy: EX19D033UWA004.ant.amazon.com (10.13.139.85) To EX19D001UWA001.ant.amazon.com (10.13.138.214) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260211_185151_954217_589EEF61 X-CRM114-Status: GOOD ( 12.40 ) 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 Apply Crypto API wrappers to the exported crypto symbol in CONFIG_CRYPTO_MD5-related crypto to convert them into pluggable interface. Signed-off-by: Jay Wang --- crypto/Makefile | 2 +- crypto/fips140/fips140-api.c | 11 +++++++++++ crypto/md5.c | 4 ++-- include/crypto/md5.h | 8 +++++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/crypto/Makefile b/crypto/Makefile index 4d03d612b942..6310c3e88e4b 100644 --- a/crypto/Makefile +++ b/crypto/Makefile @@ -77,7 +77,7 @@ crypto-objs-$(CONFIG_CRYPTO_HMAC) += hmac.o obj-$(CONFIG_CRYPTO_XCBC) += xcbc.o obj-$(CONFIG_CRYPTO_NULL) += crypto_null.o obj-$(CONFIG_CRYPTO_MD4) += md4.o -obj-$(CONFIG_CRYPTO_MD5) += md5.o +crypto-objs-$(CONFIG_CRYPTO_MD5) += md5.o obj-$(CONFIG_CRYPTO_RMD160) += rmd160.o obj-$(CONFIG_CRYPTO_SHA1) += sha1.o obj-$(CONFIG_CRYPTO_SHA256) += sha256.o diff --git a/crypto/fips140/fips140-api.c b/crypto/fips140/fips140-api.c index 17e03d4c1c9a..77ed24a3cd3b 100644 --- a/crypto/fips140/fips140-api.c +++ b/crypto/fips140/fips140-api.c @@ -368,4 +368,15 @@ DEFINE_CRYPTO_API_STUB(crypto_unregister_scomps); DEFINE_CRYPTO_API_STUB(alg_test); +#endif + +/* + * crypto/md5.c + */ +#if IS_BUILTIN(CONFIG_CRYPTO_MD5) + +#include + +#undef md5_zero_message_hash +DEFINE_CRYPTO_VAR_STUB(md5_zero_message_hash); #endif \ No newline at end of file diff --git a/crypto/md5.c b/crypto/md5.c index c167d203c710..3a11675585c7 100644 --- a/crypto/md5.c +++ b/crypto/md5.c @@ -219,13 +219,13 @@ static int __init crypto_md5_mod_init(void) { return crypto_register_shashes(algs, ARRAY_SIZE(algs)); } -module_init(crypto_md5_mod_init); +crypto_module_init(crypto_md5_mod_init); static void __exit crypto_md5_mod_exit(void) { crypto_unregister_shashes(algs, ARRAY_SIZE(algs)); } -module_exit(crypto_md5_mod_exit); +crypto_module_exit(crypto_md5_mod_exit); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Crypto API support for MD5 and HMAC-MD5"); diff --git a/include/crypto/md5.h b/include/crypto/md5.h index c47aedfe67ec..9ec82ce94c1a 100644 --- a/include/crypto/md5.h +++ b/include/crypto/md5.h @@ -2,6 +2,7 @@ #ifndef _CRYPTO_MD5_H #define _CRYPTO_MD5_H +#include #include #include @@ -20,7 +21,12 @@ #define CRYPTO_MD5_STATESIZE \ CRYPTO_HASH_STATESIZE(MD5_STATE_SIZE, MD5_HMAC_BLOCK_SIZE) -extern const u8 md5_zero_message_hash[MD5_DIGEST_SIZE]; +DECLARE_CRYPTO_VAR(CONFIG_CRYPTO_MD5, md5_zero_message_hash, const u8, [MD5_DIGEST_SIZE]); + +#if defined(CONFIG_CRYPTO_FIPS140_EXTMOD) && !defined(FIPS_MODULE) && IS_BUILTIN(CONFIG_CRYPTO_MD5) +#define md5_zero_message_hash (((const u8*)CRYPTO_VAR_NAME(md5_zero_message_hash))) +#endif + struct md5_state { u32 hash[MD5_HASH_WORDS]; -- 2.47.3