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

Commit 3cc36a4a authored by Eric Biggers's avatar Eric Biggers Committed by Greg Kroah-Hartman
Browse files

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: 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>
Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 09342a54

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/bug.h>

#include <linux/types.h>
@@ -99,4 +99,4 @@ static inline void blake2s(u8 *out, const u8 *in, const u8 *key, 
	blake2s_final(&state, out);

}



#endif /* BLAKE2S_H */
 
#endif /* _CRYPTO_BLAKE2S_H */

include/crypto/internal/blake2s.h

+3 −3
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 OR MIT */



#ifndef BLAKE2S_INTERNAL_H

#define BLAKE2S_INTERNAL_H

#ifndef _CRYPTO_INTERNAL_BLAKE2S_H

#define _CRYPTO_INTERNAL_BLAKE2S_H



#include <crypto/blake2s.h>
@@ -16,4 +16,4 @@ static inline void blake2s_set_lastblock(struct blake2s_state *state) 
	state->f[0] = -1;

}



#endif /* BLAKE2S_INTERNAL_H */
 
#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */