2019-11-08 12:22:28 +00:00
|
|
|
/* SPDX-License-Identifier: GPL-2.0 OR MIT */
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
/*
|
|
|
|
* Helper functions for BLAKE2s implementations.
|
|
|
|
* Keep this in sync with the corresponding BLAKE2b header.
|
|
|
|
*/
|
2019-11-08 12:22:28 +00:00
|
|
|
|
2020-12-23 08:09:57 +00:00
|
|
|
#ifndef _CRYPTO_INTERNAL_BLAKE2S_H
|
|
|
|
#define _CRYPTO_INTERNAL_BLAKE2S_H
|
2019-11-08 12:22:28 +00:00
|
|
|
|
|
|
|
#include <crypto/blake2s.h>
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
#include <crypto/internal/hash.h>
|
2020-12-23 08:09:53 +00:00
|
|
|
#include <linux/string.h>
|
2019-11-08 12:22:28 +00:00
|
|
|
|
2021-12-22 13:56:58 +00:00
|
|
|
void blake2s_compress_generic(struct blake2s_state *state, const u8 *block,
|
2019-11-08 12:22:28 +00:00
|
|
|
size_t nblocks, const u32 inc);
|
|
|
|
|
2021-12-22 13:56:58 +00:00
|
|
|
void blake2s_compress(struct blake2s_state *state, const u8 *block,
|
|
|
|
size_t nblocks, const u32 inc);
|
2019-11-08 12:22:28 +00:00
|
|
|
|
2020-11-27 05:43:18 +00:00
|
|
|
bool blake2s_selftest(void);
|
|
|
|
|
2019-11-08 12:22:28 +00:00
|
|
|
static inline void blake2s_set_lastblock(struct blake2s_state *state)
|
|
|
|
{
|
|
|
|
state->f[0] = -1;
|
|
|
|
}
|
|
|
|
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
/* Helper functions for BLAKE2s shared by the library and shash APIs */
|
|
|
|
|
2022-01-19 13:35:06 +00:00
|
|
|
static __always_inline void
|
|
|
|
__blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen,
|
|
|
|
bool force_generic)
|
2020-12-23 08:09:53 +00:00
|
|
|
{
|
|
|
|
const size_t fill = BLAKE2S_BLOCK_SIZE - state->buflen;
|
|
|
|
|
|
|
|
if (unlikely(!inlen))
|
|
|
|
return;
|
|
|
|
if (inlen > fill) {
|
|
|
|
memcpy(state->buf + state->buflen, in, fill);
|
2022-01-19 13:35:06 +00:00
|
|
|
if (force_generic)
|
|
|
|
blake2s_compress_generic(state, state->buf, 1,
|
|
|
|
BLAKE2S_BLOCK_SIZE);
|
|
|
|
else
|
|
|
|
blake2s_compress(state, state->buf, 1,
|
|
|
|
BLAKE2S_BLOCK_SIZE);
|
2020-12-23 08:09:53 +00:00
|
|
|
state->buflen = 0;
|
|
|
|
in += fill;
|
|
|
|
inlen -= fill;
|
|
|
|
}
|
|
|
|
if (inlen > BLAKE2S_BLOCK_SIZE) {
|
|
|
|
const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_SIZE);
|
|
|
|
/* Hash one less (full) block than strictly possible */
|
2022-01-19 13:35:06 +00:00
|
|
|
if (force_generic)
|
|
|
|
blake2s_compress_generic(state, in, nblocks - 1,
|
|
|
|
BLAKE2S_BLOCK_SIZE);
|
|
|
|
else
|
|
|
|
blake2s_compress(state, in, nblocks - 1,
|
|
|
|
BLAKE2S_BLOCK_SIZE);
|
2020-12-23 08:09:53 +00:00
|
|
|
in += BLAKE2S_BLOCK_SIZE * (nblocks - 1);
|
|
|
|
inlen -= BLAKE2S_BLOCK_SIZE * (nblocks - 1);
|
|
|
|
}
|
|
|
|
memcpy(state->buf + state->buflen, in, inlen);
|
|
|
|
state->buflen += inlen;
|
|
|
|
}
|
|
|
|
|
2022-01-19 13:35:06 +00:00
|
|
|
static __always_inline void
|
|
|
|
__blake2s_final(struct blake2s_state *state, u8 *out, bool force_generic)
|
2020-12-23 08:09:53 +00:00
|
|
|
{
|
|
|
|
blake2s_set_lastblock(state);
|
|
|
|
memset(state->buf + state->buflen, 0,
|
|
|
|
BLAKE2S_BLOCK_SIZE - state->buflen); /* Padding */
|
2022-01-19 13:35:06 +00:00
|
|
|
if (force_generic)
|
|
|
|
blake2s_compress_generic(state, state->buf, 1, state->buflen);
|
|
|
|
else
|
|
|
|
blake2s_compress(state, state->buf, 1, state->buflen);
|
2020-12-23 08:09:53 +00:00
|
|
|
cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
|
|
|
|
memcpy(out, state->h, state->outlen);
|
|
|
|
}
|
|
|
|
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
/* Helper functions for shash implementations of BLAKE2s */
|
|
|
|
|
|
|
|
struct blake2s_tfm_ctx {
|
|
|
|
u8 key[BLAKE2S_KEY_SIZE];
|
|
|
|
unsigned int keylen;
|
|
|
|
};
|
|
|
|
|
|
|
|
static inline int crypto_blake2s_setkey(struct crypto_shash *tfm,
|
|
|
|
const u8 *key, unsigned int keylen)
|
|
|
|
{
|
|
|
|
struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(tfm);
|
|
|
|
|
|
|
|
if (keylen == 0 || keylen > BLAKE2S_KEY_SIZE)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
memcpy(tctx->key, key, keylen);
|
|
|
|
tctx->keylen = keylen;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int crypto_blake2s_init(struct shash_desc *desc)
|
|
|
|
{
|
|
|
|
const struct blake2s_tfm_ctx *tctx = crypto_shash_ctx(desc->tfm);
|
|
|
|
struct blake2s_state *state = shash_desc_ctx(desc);
|
|
|
|
unsigned int outlen = crypto_shash_digestsize(desc->tfm);
|
|
|
|
|
2020-12-23 08:09:55 +00:00
|
|
|
__blake2s_init(state, outlen, tctx->key, tctx->keylen);
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int crypto_blake2s_update(struct shash_desc *desc,
|
|
|
|
const u8 *in, unsigned int inlen,
|
2022-01-19 13:35:06 +00:00
|
|
|
bool force_generic)
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
{
|
|
|
|
struct blake2s_state *state = shash_desc_ctx(desc);
|
|
|
|
|
2022-01-19 13:35:06 +00:00
|
|
|
__blake2s_update(state, in, inlen, force_generic);
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out,
|
2022-01-19 13:35:06 +00:00
|
|
|
bool force_generic)
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
{
|
|
|
|
struct blake2s_state *state = shash_desc_ctx(desc);
|
|
|
|
|
2022-01-19 13:35:06 +00:00
|
|
|
__blake2s_final(state, out, force_generic);
|
crypto: blake2s - share the "shash" API boilerplate code
Add helper functions for shash implementations of BLAKE2s to
include/crypto/internal/blake2s.h, taking advantage of
__blake2s_update() and __blake2s_final() that were added by the previous
patch to share more code between the library and shash implementations.
crypto_blake2s_setkey() and crypto_blake2s_init() are usable as
shash_alg::setkey and shash_alg::init directly, while
crypto_blake2s_update() and crypto_blake2s_final() take an extra
'blake2s_compress_t' function pointer parameter. This allows the
implementation of the compression function to be overridden, which is
the only part that optimized implementations really care about.
The new functions are inline functions (similar to those in sha1_base.h,
sha256_base.h, and sm3_base.h) because this avoids needing to add a new
module blake2s_helpers.ko, they aren't *too* long, and this avoids
indirect calls which are expensive these days. Note that they can't go
in blake2s_generic.ko, as that would require selecting CRYPTO_BLAKE2S
from CRYPTO_BLAKE2S_X86, which would cause a recursive dependency.
Finally, use these new helper functions in the x86 implementation of
BLAKE2s. (This part should be a separate patch, but unfortunately the
x86 implementation used the exact same function names like
"crypto_blake2s_update()", so it had to be updated at the same time.)
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>
2020-12-23 08:09:54 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-12-23 08:09:57 +00:00
|
|
|
#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */
|