From: Eric Biggers <ebiggers@kernel.org>
Date: Tue, 31 Mar 2026 02:44:38 +0000 (-0700)
Subject: lib/crypto: Include <crypto/utils.h> instead of <crypto/algapi.h>
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8aeeb5255d5e0001f2af6786e2a7564fef416acf;p=thirdparty%2Fkernel%2Flinux.git

lib/crypto: Include <crypto/utils.h> instead of <crypto/algapi.h>

Since the lib/crypto/ files that include <crypto/algapi.h> need it only
for the transitive inclusion of <crypto/utils.h> (and not all the
traditional crypto API stuff that the rest of <crypto/algapi.h> is
filled with), replace these inclusions with direct inclusions of
<crypto/utils.h>.

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Link: https://lore.kernel.org/r/20260331024438.51783-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---

diff --git a/lib/crypto/aescfb.c b/lib/crypto/aescfb.c
index e38848d101e33..82cd554360556 100644
--- a/lib/crypto/aescfb.c
+++ b/lib/crypto/aescfb.c
@@ -6,7 +6,7 @@
  */
 
 #include <crypto/aes.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
 #include <linux/export.h>
 #include <linux/module.h>
 
diff --git a/lib/crypto/chacha.c b/lib/crypto/chacha.c
index e0c7cb4af3180..86e5d382a4e0c 100644
--- a/lib/crypto/chacha.c
+++ b/lib/crypto/chacha.c
@@ -5,8 +5,8 @@
  * Copyright (C) 2015 Martin Willi
  */
 
-#include <crypto/algapi.h> // for crypto_xor_cpy
 #include <crypto/chacha.h>
+#include <crypto/utils.h>
 #include <linux/export.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
diff --git a/lib/crypto/memneq.c b/lib/crypto/memneq.c
index 44daacb8cb513..08924acd44bc4 100644
--- a/lib/crypto/memneq.c
+++ b/lib/crypto/memneq.c
@@ -59,7 +59,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
 #include <linux/export.h>
 #include <linux/module.h>
 #include <linux/unaligned.h>
@@ -159,7 +159,7 @@ static inline unsigned long __crypto_memneq_16(const void *a, const void *b)
 /* Compare two areas of memory without leaking timing information,
  * and with special optimizations for common sizes.  Users should
  * not call this function directly, but should instead use
- * crypto_memneq defined in crypto/algapi.h.
+ * crypto_memneq defined in crypto/utils.h.
  */
 noinline unsigned long __crypto_memneq(const void *a, const void *b,
 				       size_t size)