All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	Ard Biesheuvel <ardb@kernel.org>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	David Sterba <dsterba@suse.com>,
	"Jason A . Donenfeld" <Jason@zx2c4.com>,
	Paul Crowley <paulcrowley@google.com>
Subject: [PATCH v3 08/14] crypto: blake2s - adjust include guard naming
Date: Wed, 23 Dec 2020 00:09:57 -0800	[thread overview]
Message-ID: <20201223081003.373663-9-ebiggers@kernel.org> (raw)
In-Reply-To: <20201223081003.373663-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

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

diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h
index f1c8330a61a91..3f06183c2d804 100644
--- 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/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 */
diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h
index 867ef3753f5c1..8e50d487500f2 100644
--- a/include/crypto/internal/blake2s.h
+++ b/include/crypto/internal/blake2s.h
@@ -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 */
-- 
2.29.2


WARNING: multiple messages have this Message-ID (diff)
From: Eric Biggers <ebiggers@kernel.org>
To: linux-crypto@vger.kernel.org
Cc: "Jason A . Donenfeld" <Jason@zx2c4.com>,
	Herbert Xu <herbert@gondor.apana.org.au>,
	David Sterba <dsterba@suse.com>, Ard Biesheuvel <ardb@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	Paul Crowley <paulcrowley@google.com>
Subject: [PATCH v3 08/14] crypto: blake2s - adjust include guard naming
Date: Wed, 23 Dec 2020 00:09:57 -0800	[thread overview]
Message-ID: <20201223081003.373663-9-ebiggers@kernel.org> (raw)
In-Reply-To: <20201223081003.373663-1-ebiggers@kernel.org>

From: Eric Biggers <ebiggers@google.com>

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

diff --git a/include/crypto/blake2s.h b/include/crypto/blake2s.h
index f1c8330a61a91..3f06183c2d804 100644
--- 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/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 */
diff --git a/include/crypto/internal/blake2s.h b/include/crypto/internal/blake2s.h
index 867ef3753f5c1..8e50d487500f2 100644
--- a/include/crypto/internal/blake2s.h
+++ b/include/crypto/internal/blake2s.h
@@ -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 */
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-12-23  8:14 UTC|newest]

Thread overview: 50+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-23  8:09 [PATCH v3 00/14] crypto: arm32-optimized BLAKE2b and BLAKE2s Eric Biggers
2020-12-23  8:09 ` Eric Biggers
2020-12-23  8:09 ` [PATCH v3 01/14] crypto: blake2s - define shash_alg structs using macros Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  8:09 ` [PATCH v3 02/14] crypto: x86/blake2s " Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  8:09 ` [PATCH v3 03/14] crypto: blake2s - remove unneeded includes Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  8:09 ` [PATCH v3 04/14] crypto: blake2s - move update and final logic to internal/blake2s.h Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:05   ` Ard Biesheuvel
2020-12-23  9:05     ` Ard Biesheuvel
2020-12-23  8:09 ` [PATCH v3 05/14] crypto: blake2s - share the "shash" API boilerplate code Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:06   ` Ard Biesheuvel
2020-12-23  9:06     ` Ard Biesheuvel
2020-12-23  8:09 ` [PATCH v3 06/14] crypto: blake2s - optimize blake2s initialization Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:06   ` Ard Biesheuvel
2020-12-23  9:06     ` Ard Biesheuvel
2020-12-23  8:09 ` [PATCH v3 07/14] crypto: blake2s - add comment for blake2s_state fields Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:07   ` Ard Biesheuvel
2020-12-23  9:07     ` Ard Biesheuvel
2020-12-23  8:09 ` Eric Biggers [this message]
2020-12-23  8:09   ` [PATCH v3 08/14] crypto: blake2s - adjust include guard naming Eric Biggers
2020-12-23  9:07   ` Ard Biesheuvel
2020-12-23  9:07     ` Ard Biesheuvel
2020-12-23  8:09 ` [PATCH v3 09/14] crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h> Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:07   ` Ard Biesheuvel
2020-12-23  9:07     ` Ard Biesheuvel
2020-12-23  8:09 ` [PATCH v3 10/14] crypto: arm/blake2s - add ARM scalar optimized BLAKE2s Eric Biggers
2020-12-23  8:09   ` Eric Biggers
2020-12-23  9:08   ` Ard Biesheuvel
2020-12-23  9:08     ` Ard Biesheuvel
2020-12-23  8:10 ` [PATCH v3 11/14] wireguard: Kconfig: select CRYPTO_BLAKE2S_ARM Eric Biggers
2020-12-23  8:10   ` Eric Biggers
2020-12-23  8:10 ` [PATCH v3 12/14] crypto: blake2b - sync with blake2s implementation Eric Biggers
2020-12-23  8:10   ` Eric Biggers
2020-12-23  9:09   ` Ard Biesheuvel
2020-12-23  9:09     ` Ard Biesheuvel
2020-12-23  8:10 ` [PATCH v3 13/14] crypto: blake2b - update file comment Eric Biggers
2020-12-23  8:10   ` Eric Biggers
2020-12-23  8:10 ` [PATCH v3 14/14] crypto: arm/blake2b - add NEON-accelerated BLAKE2b Eric Biggers
2020-12-23  8:10   ` Eric Biggers
2020-12-23  9:10   ` Ard Biesheuvel
2020-12-23  9:10     ` Ard Biesheuvel
2021-01-02 22:09 ` [PATCH v3 00/14] crypto: arm32-optimized BLAKE2b and BLAKE2s Herbert Xu
2021-01-02 22:09   ` Herbert Xu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201223081003.373663-9-ebiggers@kernel.org \
    --to=ebiggers@kernel.org \
    --cc=Jason@zx2c4.com \
    --cc=ardb@kernel.org \
    --cc=dsterba@suse.com \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-crypto@vger.kernel.org \
    --cc=paulcrowley@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.