lkml.org 
[lkml]   [2022]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 047/234] crypto: blake2s - adjust include guard naming
    Date
    From: Eric Biggers <ebiggers@google.com>

    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>
    ---
    include/crypto/blake2s.h | 6 +++---
    include/crypto/internal/blake2s.h | 6 +++---
    2 files changed, 6 insertions(+), 6 deletions(-)

    --- a/include/crypto/blake2s.h
    +++ b/include/crypto/blake2s.h
    @@ -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, cons
    blake2s_final(&state, out);
    }

    -#endif /* BLAKE2S_H */
    +#endif /* _CRYPTO_BLAKE2S_H */
    --- a/include/crypto/internal/blake2s.h
    +++ b/include/crypto/internal/blake2s.h
    @@ -1,7 +1,7 @@
    /* 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
    state->f[0] = -1;
    }

    -#endif /* BLAKE2S_INTERNAL_H */
    +#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */

    \
     
     \ /
      Last update: 2022-06-23 19:57    [W:4.100 / U:1.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site