| Message ID | E1qYlA0-006vFr-Ts@formenos.hmeau.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | Do not include crypto/algapi.h | expand |
On Wed, 2023-08-23 at 18:32 +0800, Herbert Xu wrote: > The header file crypto/algapi.h is for internal use only. Use the > header file crypto/utils.h instead. > No objection, of course, but I don't think it's necessarily clear that it "is for internal use only", it literally says: * Cryptographic API for algorithms (i.e., low-level API). which really isn't the same as "don't use this file". Might want to clarify that, or even move it into crypto/ from include/crypto/ or something? johannes
On Wed, Aug 23, 2023 at 12:34:35PM +0200, Johannes Berg wrote: > > No objection, of course, but I don't think it's necessarily clear that > it "is for internal use only", it literally says: > > * Cryptographic API for algorithms (i.e., low-level API). > > which really isn't the same as "don't use this file". > > Might want to clarify that, or even move it into crypto/ from > include/crypto/ or something? Yes it should be in include/crypto/internal. Once the churn gets small enough I'll move it there. Thanks,
On Thu, 2023-08-24 at 13:10 +0800, Herbert Xu wrote: > On Wed, Aug 23, 2023 at 12:34:35PM +0200, Johannes Berg wrote: > > > > No objection, of course, but I don't think it's necessarily clear that > > it "is for internal use only", it literally says: > > > > * Cryptographic API for algorithms (i.e., low-level API). > > > > which really isn't the same as "don't use this file". > > > > Might want to clarify that, or even move it into crypto/ from > > include/crypto/ or something? > > Yes it should be in include/crypto/internal. Once the churn gets > small enough I'll move it there. > Sounds good :) I was kind of waiting to see - but now that others have applied some patches to their tree I've done the same. johannes
On Thu, Aug 24, 2023 at 08:59:08AM +0200, Johannes Berg wrote: > > I was kind of waiting to see - but now that others have applied some > patches to their tree I've done the same. Noted. Thanks!
diff --git a/net/mac80211/fils_aead.c b/net/mac80211/fils_aead.c index e1d4cfd99128..912c46f74d24 100644 --- a/net/mac80211/fils_aead.c +++ b/net/mac80211/fils_aead.c @@ -5,9 +5,9 @@ */ #include <crypto/aes.h> -#include <crypto/algapi.h> #include <crypto/hash.h> #include <crypto/skcipher.h> +#include <crypto/utils.h> #include "ieee80211_i.h" #include "aes_cmac.h" diff --git a/net/mac80211/key.c b/net/mac80211/key.c index 21cf5a208910..13050dc9321f 100644 --- a/net/mac80211/key.c +++ b/net/mac80211/key.c @@ -9,6 +9,7 @@ * Copyright 2018-2020, 2022-2023 Intel Corporation */ +#include <crypto/utils.h> #include <linux/if_ether.h> #include <linux/etherdevice.h> #include <linux/list.h> @@ -17,7 +18,6 @@ #include <linux/slab.h> #include <linux/export.h> #include <net/mac80211.h> -#include <crypto/algapi.h> #include <asm/unaligned.h> #include "ieee80211_i.h" #include "driver-ops.h" diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index 4133496da378..2d8e38b3bcb5 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -15,7 +15,7 @@ #include <asm/unaligned.h> #include <net/mac80211.h> #include <crypto/aes.h> -#include <crypto/algapi.h> +#include <crypto/utils.h> #include "ieee80211_i.h" #include "michael.h"
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> --- net/mac80211/fils_aead.c | 2 +- net/mac80211/key.c | 2 +- net/mac80211/wpa.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)