github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

UPSTREAM: crypto: blake2s - adjust include guard naming

Browse Source 
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>

(cherry picked from commit 8786841bc2)
Bug: 152722841
Bug: 178411248
Change-Id: Iea57edbe14c9083ce3d7a77b2c3bd63cd6650e56
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers 2020-12-23 00:09:57 -08:00 committed by Greg Kroah-Hartman
parent c42fac6d71
commit f006426a4f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/crypto/blake2s.h
View File

@ -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>
@ -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
include/crypto/internal/blake2s.h
View File

@ -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 */