forked from luck/tmp_suning_uos_patched
crypto: blake2s - adjust include guard naming
commit 8786841bc2020f7f2513a6c74e64912f07b9c0dc 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>
This commit is contained in:
parent
fea91e9070
commit
030d3443aa
|
@ -3,8 +3,8 @@
|
||||||
* Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
|
* Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BLAKE2S_H
|
#ifndef _CRYPTO_BLAKE2S_H
|
||||||
#define BLAKE2S_H
|
#define _CRYPTO_BLAKE2S_H
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/kernel.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,
|
void blake2s256_hmac(u8 *out, const u8 *in, const u8 *key, const size_t inlen,
|
||||||
const size_t keylen);
|
const size_t keylen);
|
||||||
|
|
||||||
#endif /* BLAKE2S_H */
|
#endif /* _CRYPTO_BLAKE2S_H */
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
* Keep this in sync with the corresponding BLAKE2b header.
|
* Keep this in sync with the corresponding BLAKE2b header.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef BLAKE2S_INTERNAL_H
|
#ifndef _CRYPTO_INTERNAL_BLAKE2S_H
|
||||||
#define BLAKE2S_INTERNAL_H
|
#define _CRYPTO_INTERNAL_BLAKE2S_H
|
||||||
|
|
||||||
#include <crypto/blake2s.h>
|
#include <crypto/blake2s.h>
|
||||||
#include <crypto/internal/hash.h>
|
#include <crypto/internal/hash.h>
|
||||||
|
@ -116,4 +116,4 @@ static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* BLAKE2S_INTERNAL_H */
|
#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user