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

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

[Eric Biggers]

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>.

Signed-off-by: Eric Biggers <ebiggers@kernel.org>
---
 lib/crypto/aescfb.c | 2 +-
 lib/crypto/chacha.c | 2 +-
 lib/crypto/memneq.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/crypto/aescfb.c b/lib/crypto/aescfb.c
index e38848d101e3..82cd55436055 100644
--- a/lib/crypto/aescfb.c
+++ b/lib/crypto/aescfb.c
@@ -4,11 +4,11 @@
  *
  * Copyright 2023 Google LLC
  */
 
 #include <crypto/aes.h>
-#include <crypto/algapi.h>
+#include <crypto/utils.h>
 #include <linux/export.h>
 #include <linux/module.h>
 
 /**
  * aescfb_encrypt - Perform AES-CFB encryption on a block of data
diff --git a/lib/crypto/chacha.c b/lib/crypto/chacha.c
index e0c7cb4af318..86e5d382a4e0 100644
--- a/lib/crypto/chacha.c
+++ b/lib/crypto/chacha.c
@@ -3,12 +3,12 @@
  * The ChaCha stream cipher (RFC7539)
  *
  * 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>
 
 static void __maybe_unused
diff --git a/lib/crypto/memneq.c b/lib/crypto/memneq.c
index 44daacb8cb51..08924acd44bc 100644
--- a/lib/crypto/memneq.c
+++ b/lib/crypto/memneq.c
@@ -57,11 +57,11 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * 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>
 
 /* Generic path for arbitrary size */
@@ -157,11 +157,11 @@ 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)
 {
 	switch (size) {

base-commit: d2a68aba8505ce88b39c34ecb3b707c776af79d4
prerequisite-patch-id: bb75bceea1086ce63912baf959cd010cdd451208
prerequisite-patch-id: 0bd0bf7e94c78811a3371910650acf3a62b7de2c
-- 
2.53.0

Re: [PATCH] lib/crypto: Include <crypto/utils.h> instead of <crypto/algapi.h>

[Ard Biesheuvel]

On Tue, 31 Mar 2026, at 04:44, Eric Biggers wrote:
> 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>.
>
> Signed-off-by: Eric Biggers <ebiggers@kernel.org>
> ---
>  lib/crypto/aescfb.c | 2 +-
>  lib/crypto/chacha.c | 2 +-
>  lib/crypto/memneq.c | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

Re: [PATCH] lib/crypto: Include <crypto/utils.h> instead of <crypto/algapi.h>

[Eric Biggers]

On Mon, Mar 30, 2026 at 07:44:38PM -0700, Eric Biggers wrote:
> 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>.
> 
> Signed-off-by: Eric Biggers <ebiggers@kernel.org>
> ---
>  lib/crypto/aescfb.c | 2 +-
>  lib/crypto/chacha.c | 2 +-
>  lib/crypto/memneq.c | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)

Applied to https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git/log/?h=libcrypto-next

- Eric