Re: [PATCH 11/12] wireguard: Do not include crypto/algapi.h

Jason A. Donenfeld
2023-08-23T11:52:18Z

On Wed, Aug 23, 2023 at 12:33 PM Herbert Xu <herbert@gondor.apana.org.au> wrote:
>
> The header file crypto/algapi.h is for internal use only. Use the
> header file crypto/utils.h instead.
>
> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
> ---
>
> drivers/net/wireguard/cookie.c | 2 +-
> drivers/net/wireguard/netlink.c | 2 +-
> drivers/net/wireguard/noise.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/wireguard/cookie.c b/drivers/net/wireguard/cookie.c
> index 4956f0499c19..f89581b5e8cb 100644
> --- a/drivers/net/wireguard/cookie.c
> +++ b/drivers/net/wireguard/cookie.c
> @@ -12,9 +12,9 @@
>
> #include <crypto/blake2s.h>
> #include <crypto/chacha20poly1305.h>
> +#include <crypto/utils.h>
>
> #include <net/ipv6.h>
> -#include <crypto/algapi.h>
>
> void wg_cookie_checker_init(struct cookie_checker *checker,
> struct wg_device *wg)
> diff --git a/drivers/net/wireguard/netlink.c b/drivers/net/wireguard/netlink.c
> index 6d1bd9f52d02..0a1502100e8b 100644
> --- a/drivers/net/wireguard/netlink.c
> +++ b/drivers/net/wireguard/netlink.c
> @@ -12,10 +12,10 @@
>
> #include <uapi/linux/wireguard.h>
>
> +#include <crypto/utils.h>
> #include <linux/if.h>
> #include <net/genetlink.h>
> #include <net/sock.h>
> -#include <crypto/algapi.h>
>
> static struct genl_family genl_family;
>
> diff --git a/drivers/net/wireguard/noise.c b/drivers/net/wireguard/noise.c
> index 720952b92e78..e7ad81ca4a36 100644
> --- a/drivers/net/wireguard/noise.c
> +++ b/drivers/net/wireguard/noise.c
> @@ -10,12 +10,12 @@
> #include "queueing.h"
> #include "peerlookup.h"
>
> +#include <crypto/utils.h>
> #include <linux/rcupdate.h>
> #include <linux/slab.h>
> #include <linux/bitmap.h>
> #include <linux/scatterlist.h>
> #include <linux/highmem.h>
> -#include <crypto/algapi.h>
>
> /* This implements Noise_IKpsk2:
> *

Small nit - with the exception of the cookie.c reordering, could you
maintain the existing #include ordering of the other files? No need to
send a v2 for that if you don't want. And please make the entire
commit subject lowercase. With those done,

Acked-by: Jason A. Donenfeld <Jason@zx2c4.com>

As a side note, you may want to eventually do something to make sure
people don't add back algapi.h, like move it to internal/ or out of
include/ all together. I figure you've already thought about this, and
this series is just the first step.

Jason