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 v2 01/11] crypto: blake2b - rename constants for consistency with blake2s
Date: Thu, 17 Dec 2020 14:21:28 -0800 [thread overview]
Message-ID: <20201217222138.170526-2-ebiggers@kernel.org> (raw)
In-Reply-To: <20201217222138.170526-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Rename some BLAKE2b-related constants to be consistent with the names
used in the BLAKE2s implementation (see include/crypto/blake2s.h):
BLAKE2B_*_DIGEST_SIZE => BLAKE2B_*_HASH_SIZE
BLAKE2B_BLOCKBYTES => BLAKE2B_BLOCK_SIZE
BLAKE2B_KEYBYTES => BLAKE2B_KEY_SIZE
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/blake2b_generic.c | 58 +++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/crypto/blake2b_generic.c b/crypto/blake2b_generic.c
index a2ffe60e06d34..83942f511075e 100644
--- a/crypto/blake2b_generic.c
+++ b/crypto/blake2b_generic.c
@@ -25,21 +25,22 @@
#include <linux/bitops.h>
#include <crypto/internal/hash.h>
-#define BLAKE2B_160_DIGEST_SIZE (160 / 8)
-#define BLAKE2B_256_DIGEST_SIZE (256 / 8)
-#define BLAKE2B_384_DIGEST_SIZE (384 / 8)
-#define BLAKE2B_512_DIGEST_SIZE (512 / 8)
-
-enum blake2b_constant {
- BLAKE2B_BLOCKBYTES = 128,
- BLAKE2B_KEYBYTES = 64,
+
+enum blake2b_lengths {
+ BLAKE2B_BLOCK_SIZE = 128,
+ BLAKE2B_KEY_SIZE = 64,
+
+ BLAKE2B_160_HASH_SIZE = 20,
+ BLAKE2B_256_HASH_SIZE = 32,
+ BLAKE2B_384_HASH_SIZE = 48,
+ BLAKE2B_512_HASH_SIZE = 64,
};
struct blake2b_state {
u64 h[8];
u64 t[2];
u64 f[2];
- u8 buf[BLAKE2B_BLOCKBYTES];
+ u8 buf[BLAKE2B_BLOCK_SIZE];
size_t buflen;
};
@@ -96,7 +97,7 @@ static void blake2b_increment_counter(struct blake2b_state *S, const u64 inc)
} while (0)
static void blake2b_compress(struct blake2b_state *S,
- const u8 block[BLAKE2B_BLOCKBYTES])
+ const u8 block[BLAKE2B_BLOCK_SIZE])
{
u64 m[16];
u64 v[16];
@@ -140,7 +141,7 @@ static void blake2b_compress(struct blake2b_state *S,
#undef ROUND
struct blake2b_tfm_ctx {
- u8 key[BLAKE2B_KEYBYTES];
+ u8 key[BLAKE2B_KEY_SIZE];
unsigned int keylen;
};
@@ -149,7 +150,7 @@ static int blake2b_setkey(struct crypto_shash *tfm, const u8 *key,
{
struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(tfm);
- if (keylen == 0 || keylen > BLAKE2B_KEYBYTES)
+ if (keylen == 0 || keylen > BLAKE2B_KEY_SIZE)
return -EINVAL;
memcpy(tctx->key, key, keylen);
@@ -176,7 +177,7 @@ static int blake2b_init(struct shash_desc *desc)
* _final will process it
*/
memcpy(state->buf, tctx->key, tctx->keylen);
- state->buflen = BLAKE2B_BLOCKBYTES;
+ state->buflen = BLAKE2B_BLOCK_SIZE;
}
return 0;
}
@@ -186,7 +187,7 @@ static int blake2b_update(struct shash_desc *desc, const u8 *in,
{
struct blake2b_state *state = shash_desc_ctx(desc);
const size_t left = state->buflen;
- const size_t fill = BLAKE2B_BLOCKBYTES - left;
+ const size_t fill = BLAKE2B_BLOCK_SIZE - left;
if (!inlen)
return 0;
@@ -195,16 +196,16 @@ static int blake2b_update(struct shash_desc *desc, const u8 *in,
state->buflen = 0;
/* Fill buffer */
memcpy(state->buf + left, in, fill);
- blake2b_increment_counter(state, BLAKE2B_BLOCKBYTES);
+ blake2b_increment_counter(state, BLAKE2B_BLOCK_SIZE);
/* Compress */
blake2b_compress(state, state->buf);
in += fill;
inlen -= fill;
- while (inlen > BLAKE2B_BLOCKBYTES) {
- blake2b_increment_counter(state, BLAKE2B_BLOCKBYTES);
+ while (inlen > BLAKE2B_BLOCK_SIZE) {
+ blake2b_increment_counter(state, BLAKE2B_BLOCK_SIZE);
blake2b_compress(state, in);
- in += BLAKE2B_BLOCKBYTES;
- inlen -= BLAKE2B_BLOCKBYTES;
+ in += BLAKE2B_BLOCK_SIZE;
+ inlen -= BLAKE2B_BLOCK_SIZE;
}
}
memcpy(state->buf + state->buflen, in, inlen);
@@ -223,7 +224,8 @@ static int blake2b_final(struct shash_desc *desc, u8 *out)
/* Set last block */
state->f[0] = (u64)-1;
/* Padding */
- memset(state->buf + state->buflen, 0, BLAKE2B_BLOCKBYTES - state->buflen);
+ memset(state->buf + state->buflen, 0,
+ BLAKE2B_BLOCK_SIZE - state->buflen);
blake2b_compress(state, state->buf);
/* Avoid temporary buffer and switch the internal output to LE order */
@@ -240,10 +242,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-160-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_160_DIGEST_SIZE,
+ .digestsize = BLAKE2B_160_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -254,10 +256,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-256-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_256_DIGEST_SIZE,
+ .digestsize = BLAKE2B_256_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -268,10 +270,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-384-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_384_DIGEST_SIZE,
+ .digestsize = BLAKE2B_384_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -282,10 +284,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-512-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_512_DIGEST_SIZE,
+ .digestsize = BLAKE2B_512_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
base-commit: 0c6c887835b59c10602add88057c9c06f265effe
--
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 v2 01/11] crypto: blake2b - rename constants for consistency with blake2s
Date: Thu, 17 Dec 2020 14:21:28 -0800 [thread overview]
Message-ID: <20201217222138.170526-2-ebiggers@kernel.org> (raw)
In-Reply-To: <20201217222138.170526-1-ebiggers@kernel.org>
From: Eric Biggers <ebiggers@google.com>
Rename some BLAKE2b-related constants to be consistent with the names
used in the BLAKE2s implementation (see include/crypto/blake2s.h):
BLAKE2B_*_DIGEST_SIZE => BLAKE2B_*_HASH_SIZE
BLAKE2B_BLOCKBYTES => BLAKE2B_BLOCK_SIZE
BLAKE2B_KEYBYTES => BLAKE2B_KEY_SIZE
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
---
crypto/blake2b_generic.c | 58 +++++++++++++++++++++-------------------
1 file changed, 30 insertions(+), 28 deletions(-)
diff --git a/crypto/blake2b_generic.c b/crypto/blake2b_generic.c
index a2ffe60e06d34..83942f511075e 100644
--- a/crypto/blake2b_generic.c
+++ b/crypto/blake2b_generic.c
@@ -25,21 +25,22 @@
#include <linux/bitops.h>
#include <crypto/internal/hash.h>
-#define BLAKE2B_160_DIGEST_SIZE (160 / 8)
-#define BLAKE2B_256_DIGEST_SIZE (256 / 8)
-#define BLAKE2B_384_DIGEST_SIZE (384 / 8)
-#define BLAKE2B_512_DIGEST_SIZE (512 / 8)
-
-enum blake2b_constant {
- BLAKE2B_BLOCKBYTES = 128,
- BLAKE2B_KEYBYTES = 64,
+
+enum blake2b_lengths {
+ BLAKE2B_BLOCK_SIZE = 128,
+ BLAKE2B_KEY_SIZE = 64,
+
+ BLAKE2B_160_HASH_SIZE = 20,
+ BLAKE2B_256_HASH_SIZE = 32,
+ BLAKE2B_384_HASH_SIZE = 48,
+ BLAKE2B_512_HASH_SIZE = 64,
};
struct blake2b_state {
u64 h[8];
u64 t[2];
u64 f[2];
- u8 buf[BLAKE2B_BLOCKBYTES];
+ u8 buf[BLAKE2B_BLOCK_SIZE];
size_t buflen;
};
@@ -96,7 +97,7 @@ static void blake2b_increment_counter(struct blake2b_state *S, const u64 inc)
} while (0)
static void blake2b_compress(struct blake2b_state *S,
- const u8 block[BLAKE2B_BLOCKBYTES])
+ const u8 block[BLAKE2B_BLOCK_SIZE])
{
u64 m[16];
u64 v[16];
@@ -140,7 +141,7 @@ static void blake2b_compress(struct blake2b_state *S,
#undef ROUND
struct blake2b_tfm_ctx {
- u8 key[BLAKE2B_KEYBYTES];
+ u8 key[BLAKE2B_KEY_SIZE];
unsigned int keylen;
};
@@ -149,7 +150,7 @@ static int blake2b_setkey(struct crypto_shash *tfm, const u8 *key,
{
struct blake2b_tfm_ctx *tctx = crypto_shash_ctx(tfm);
- if (keylen == 0 || keylen > BLAKE2B_KEYBYTES)
+ if (keylen == 0 || keylen > BLAKE2B_KEY_SIZE)
return -EINVAL;
memcpy(tctx->key, key, keylen);
@@ -176,7 +177,7 @@ static int blake2b_init(struct shash_desc *desc)
* _final will process it
*/
memcpy(state->buf, tctx->key, tctx->keylen);
- state->buflen = BLAKE2B_BLOCKBYTES;
+ state->buflen = BLAKE2B_BLOCK_SIZE;
}
return 0;
}
@@ -186,7 +187,7 @@ static int blake2b_update(struct shash_desc *desc, const u8 *in,
{
struct blake2b_state *state = shash_desc_ctx(desc);
const size_t left = state->buflen;
- const size_t fill = BLAKE2B_BLOCKBYTES - left;
+ const size_t fill = BLAKE2B_BLOCK_SIZE - left;
if (!inlen)
return 0;
@@ -195,16 +196,16 @@ static int blake2b_update(struct shash_desc *desc, const u8 *in,
state->buflen = 0;
/* Fill buffer */
memcpy(state->buf + left, in, fill);
- blake2b_increment_counter(state, BLAKE2B_BLOCKBYTES);
+ blake2b_increment_counter(state, BLAKE2B_BLOCK_SIZE);
/* Compress */
blake2b_compress(state, state->buf);
in += fill;
inlen -= fill;
- while (inlen > BLAKE2B_BLOCKBYTES) {
- blake2b_increment_counter(state, BLAKE2B_BLOCKBYTES);
+ while (inlen > BLAKE2B_BLOCK_SIZE) {
+ blake2b_increment_counter(state, BLAKE2B_BLOCK_SIZE);
blake2b_compress(state, in);
- in += BLAKE2B_BLOCKBYTES;
- inlen -= BLAKE2B_BLOCKBYTES;
+ in += BLAKE2B_BLOCK_SIZE;
+ inlen -= BLAKE2B_BLOCK_SIZE;
}
}
memcpy(state->buf + state->buflen, in, inlen);
@@ -223,7 +224,8 @@ static int blake2b_final(struct shash_desc *desc, u8 *out)
/* Set last block */
state->f[0] = (u64)-1;
/* Padding */
- memset(state->buf + state->buflen, 0, BLAKE2B_BLOCKBYTES - state->buflen);
+ memset(state->buf + state->buflen, 0,
+ BLAKE2B_BLOCK_SIZE - state->buflen);
blake2b_compress(state, state->buf);
/* Avoid temporary buffer and switch the internal output to LE order */
@@ -240,10 +242,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-160-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_160_DIGEST_SIZE,
+ .digestsize = BLAKE2B_160_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -254,10 +256,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-256-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_256_DIGEST_SIZE,
+ .digestsize = BLAKE2B_256_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -268,10 +270,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-384-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_384_DIGEST_SIZE,
+ .digestsize = BLAKE2B_384_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
@@ -282,10 +284,10 @@ static struct shash_alg blake2b_algs[] = {
.base.cra_driver_name = "blake2b-512-generic",
.base.cra_priority = 100,
.base.cra_flags = CRYPTO_ALG_OPTIONAL_KEY,
- .base.cra_blocksize = BLAKE2B_BLOCKBYTES,
+ .base.cra_blocksize = BLAKE2B_BLOCK_SIZE,
.base.cra_ctxsize = sizeof(struct blake2b_tfm_ctx),
.base.cra_module = THIS_MODULE,
- .digestsize = BLAKE2B_512_DIGEST_SIZE,
+ .digestsize = BLAKE2B_512_HASH_SIZE,
.setkey = blake2b_setkey,
.init = blake2b_init,
.update = blake2b_update,
base-commit: 0c6c887835b59c10602add88057c9c06f265effe
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-17 22:25 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 22:21 [PATCH v2 00/11] crypto: arm32-optimized BLAKE2b and BLAKE2s Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` Eric Biggers [this message]
2020-12-17 22:21 ` [PATCH v2 01/11] crypto: blake2b - rename constants for consistency with blake2s Eric Biggers
2020-12-17 22:21 ` [PATCH v2 02/11] crypto: blake2b - define shash_alg structs using macros Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 03/11] crypto: blake2b - export helpers for optimized implementations Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 04/11] crypto: blake2b - update file comment Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 05/11] crypto: arm/blake2b - add NEON-accelerated BLAKE2b Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 06/11] crypto: blake2s - define shash_alg structs using macros Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 07/11] crypto: x86/blake2s " Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 08/11] crypto: blake2s - remove unneeded includes Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 09/11] crypto: blake2s - share the "shash" API boilerplate code Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-18 16:14 ` Jason A. Donenfeld
2020-12-18 16:14 ` Jason A. Donenfeld
2020-12-18 20:08 ` Eric Biggers
2020-12-18 20:08 ` Eric Biggers
2020-12-19 0:01 ` Jason A. Donenfeld
2020-12-19 0:01 ` Jason A. Donenfeld
2020-12-22 8:55 ` Eric Biggers
2020-12-22 8:55 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 10/11] crypto: arm/blake2s - add ARM scalar optimized BLAKE2s Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-17 22:21 ` [PATCH v2 11/11] wireguard: Kconfig: select CRYPTO_BLAKE2S_ARM Eric Biggers
2020-12-17 22:21 ` Eric Biggers
2020-12-18 16:02 ` Jason A. Donenfeld
2020-12-18 16:02 ` Jason A. Donenfeld
2020-12-18 16:30 ` [PATCH v2 00/11] crypto: arm32-optimized BLAKE2b and BLAKE2s Ard Biesheuvel
2020-12-18 16:30 ` Ard Biesheuvel
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=20201217222138.170526-2-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.