On Wed, 23 Dec 2020 at 09:12, Eric Biggers <ebiggers@xxxxxxxxxx> wrote: > > From: Eric Biggers <ebiggers@xxxxxxxxxx> > > Use the full path in the include guards for the BLAKE2s headers to avoid > ambiguity and to match the convention for most files in include/crypto/. > > Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx> > --- > include/crypto/blake2s.h | 6 +++--- > include/crypto/internal/blake2s.h | 6 +++--- > 2 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h > index f1c8330a61a91..3f06183c2d804 100644 > --- a/include/crypto/blake2s.h > +++ b/include/crypto/blake2s.h > @@ -3,8 +3,8 @@ > * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@xxxxxxxxx>. All Rights Reserved. > */ > > -#ifndef BLAKE2S_H > -#define BLAKE2S_H > +#ifndef _CRYPTO_BLAKE2S_H > +#define _CRYPTO_BLAKE2S_H > > #include <linux/types.h> > #include <linux/kernel.h> > @@ -105,4 +105,4 @@ static inline void blake2s(u8 *out, const u8 *in, const u8 *key, > void blake2s256_hmac(u8 *out, const u8 *in, const u8 *key, const size_t inlen, > const size_t keylen); > > -#endif /* BLAKE2S_H */ > +#endif /* _CRYPTO_BLAKE2S_H */ > diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h > index 867ef3753f5c1..8e50d487500f2 100644 > --- a/include/crypto/internal/blake2s.h > +++ b/include/crypto/internal/blake2s.h > @@ -4,8 +4,8 @@ > * Keep this in sync with the corresponding BLAKE2b header. > */ > > -#ifndef BLAKE2S_INTERNAL_H > -#define BLAKE2S_INTERNAL_H > +#ifndef _CRYPTO_INTERNAL_BLAKE2S_H > +#define _CRYPTO_INTERNAL_BLAKE2S_H > > #include <crypto/blake2s.h> > #include <crypto/internal/hash.h> > @@ -116,4 +116,4 @@ static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out, > return 0; > } > > -#endif /* BLAKE2S_INTERNAL_H */ > +#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */ > -- > 2.29.2 >
