Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6ae0150 authored by Eric Biggers's avatar Eric Biggers Committed by Alistair Delva
Browse files

UPSTREAM: crypto: blake2s - adjust include guard naming 



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: default avatarEric Biggers <ebiggers@google.com>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>

(cherry picked from commit 8786841bc2020f7f2513a6c74e64912f07b9c0dc)
Bug: 152722841
Bug: 178411248
Change-Id: Iea57edbe14c9083ce3d7a77b2c3bd63cd6650e56
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
parent 2761b1d0

include/crypto/blake2s.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */

include/crypto/internal/blake2s.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */