Skip to content

Commit

Permalink
crypto: blake2s - adjust include guard naming
Browse files Browse the repository at this point in the history
commit 8786841 upstream.

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@google.com>
Acked-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
ebiggers authored and gregkh committed May 30, 2022
1 parent fea91e9 commit 030d344
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions include/crypto/blake2s.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
* Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. 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>
Expand Down Expand Up @@ -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 */
6 changes: 3 additions & 3 deletions include/crypto/internal/blake2s.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */

0 comments on commit 030d344

Please sign in to comment.