From 179063dcbd425bf8003a26637a966cb116b3a3d0 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 13 Jan 2022 00:15:11 +0100 Subject: Add *_force_update for BLAKE2[X] (intended for parallel hashing) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 4 ++++ libblake.h | 8 ++++++++ libblake_blake2b_force_update.c | 19 +++++++++++++++++++ libblake_blake2s_force_update.c | 19 +++++++++++++++++++ libblake_blake2xb_force_update.c | 4 ++++ libblake_blake2xs_force_update.c | 4 ++++ 6 files changed, 58 insertions(+) create mode 100644 libblake_blake2b_force_update.c create mode 100644 libblake_blake2s_force_update.c create mode 100644 libblake_blake2xb_force_update.c create mode 100644 libblake_blake2xs_force_update.c diff --git a/Makefile b/Makefile index df52ffe..d96ac42 100644 --- a/Makefile +++ b/Makefile @@ -47,12 +47,16 @@ OBJ_BLAKE2 =\ libblake_blake2s_digest.o\ libblake_blake2b_digest_get_required_input_size.o\ libblake_blake2s_digest_get_required_input_size.o\ + libblake_blake2b_force_update.o\ + libblake_blake2s_force_update.o\ libblake_blake2b_init.o\ libblake_blake2s_init.o\ libblake_blake2b_update.o\ libblake_blake2s_update.o\ libblake_blake2xb_digest.o\ libblake_blake2xs_digest.o\ + libblake_blake2xb_force_update.o\ + libblake_blake2xs_force_update.o\ libblake_blake2xb_init.o\ libblake_blake2xs_init.o\ libblake_blake2xb_predigest.o\ diff --git a/libblake.h b/libblake.h index 7dc11a4..4d96c95 100644 --- a/libblake.h +++ b/libblake.h @@ -150,6 +150,7 @@ struct libblake_blake2xb_state { void libblake_blake2s_init(struct libblake_blake2s_state *state, const struct libblake_blake2s_params *params, const unsigned char *key /* append null bytes until 64 bytes; if key is used */); size_t libblake_blake2s_update(struct libblake_blake2s_state *state, const void *data, size_t len); +size_t libblake_blake2s_force_update(struct libblake_blake2s_state *state, const void *data, size_t len); void libblake_blake2s_digest(struct libblake_blake2s_state *state, void *data, size_t len, int last_node /* normally 0 */, size_t output_len, unsigned char output[static output_len]); LIBBLAKE_CONST__ size_t libblake_blake2s_digest_get_required_input_size(size_t len); @@ -157,6 +158,7 @@ LIBBLAKE_CONST__ size_t libblake_blake2s_digest_get_required_input_size(size_t l void libblake_blake2b_init(struct libblake_blake2b_state *state, const struct libblake_blake2b_params *params, const unsigned char *key /* append null bytes until 128 bytes; if key is used */); size_t libblake_blake2b_update(struct libblake_blake2b_state *state, const void *data, size_t len); +size_t libblake_blake2b_force_update(struct libblake_blake2b_state *state, const void *data, size_t len); void libblake_blake2b_digest(struct libblake_blake2b_state *state, void *data, size_t len, int last_node /* normally 0 */, size_t output_len, unsigned char output[static output_len]); LIBBLAKE_CONST__ size_t libblake_blake2b_digest_get_required_input_size(size_t len); @@ -166,6 +168,9 @@ void libblake_blake2xs_init(struct libblake_blake2xs_state *state, const struct inline size_t libblake_blake2xs_update(struct libblake_blake2xs_state *state, const void *data, size_t len) { return libblake_blake2s_update(&state->b2s, data, len); } +inline size_t libblake_blake2xs_force_update(struct libblake_blake2xs_state *state, const void *data, size_t len) { + return libblake_blake2s_force_update(&state->b2s, data, len); +} inline void libblake_blake2xs_predigest(struct libblake_blake2xs_state *state, void *data, size_t len, int last_node) { libblake_blake2s_digest(&state->b2s, data, len, last_node, (size_t)state->xof_params.digest_len, state->intermediate); } @@ -182,6 +187,9 @@ void libblake_blake2xb_init(struct libblake_blake2xb_state *state, const struct inline size_t libblake_blake2xb_update(struct libblake_blake2xb_state *state, const void *data, size_t len) { return libblake_blake2b_update(&state->b2b, data, len); } +inline size_t libblake_blake2xb_force_update(struct libblake_blake2xb_state *state, const void *data, size_t len) { + return libblake_blake2b_update(&state->b2b, data, len); +} inline void libblake_blake2xb_predigest(struct libblake_blake2xb_state *state, void *data, size_t len, int last_node) { libblake_blake2b_digest(&state->b2b, data, len, last_node, state->xof_params.digest_len, state->intermediate); } diff --git a/libblake_blake2b_force_update.c b/libblake_blake2b_force_update.c new file mode 100644 index 0000000..60b8fab --- /dev/null +++ b/libblake_blake2b_force_update.c @@ -0,0 +1,19 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + +size_t +libblake_blake2b_force_update(struct libblake_blake2b_state *state, const void *data_, size_t len) +{ + const unsigned char *data = data_; + size_t off = 0; + + for (; len - off >= 128; off += 128) { + state->t[0] = (state->t[0] + 128) & UINT_LEAST64_C(0xFFFFffffFFFFffff); + if (state->t[0] < 128) + state->t[1] = (state->t[1] + 1) & UINT_LEAST64_C(0xFFFFffffFFFFffff); + + libblake_internal_blake2b_compress(state, &data[off]); + } + + return off; +} diff --git a/libblake_blake2s_force_update.c b/libblake_blake2s_force_update.c new file mode 100644 index 0000000..925d381 --- /dev/null +++ b/libblake_blake2s_force_update.c @@ -0,0 +1,19 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + +size_t +libblake_blake2s_force_update(struct libblake_blake2s_state *state, const void *data_, size_t len) +{ + const unsigned char *data = data_; + size_t off = 0; + + for (; len - off >= 64; off += 64) { + state->t[0] = (state->t[0] + 64) & UINT_LEAST32_C(0xFFFFffff); + if (state->t[0] < 64) + state->t[1] = (state->t[1] + 1) & UINT_LEAST32_C(0xFFFFffff); + + libblake_internal_blake2s_compress(state, &data[off]); + } + + return off; +} diff --git a/libblake_blake2xb_force_update.c b/libblake_blake2xb_force_update.c new file mode 100644 index 0000000..6c37493 --- /dev/null +++ b/libblake_blake2xb_force_update.c @@ -0,0 +1,4 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + +extern inline size_t libblake_blake2xb_force_update(struct libblake_blake2xb_state *state, const void *data, size_t len); diff --git a/libblake_blake2xs_force_update.c b/libblake_blake2xs_force_update.c new file mode 100644 index 0000000..92fbc48 --- /dev/null +++ b/libblake_blake2xs_force_update.c @@ -0,0 +1,4 @@ +/* See LICENSE file for copyright and license details. */ +#include "common.h" + +extern inline size_t libblake_blake2xs_force_update(struct libblake_blake2xs_state *state, const void *data, size_t len); -- cgit v1.2.3-70-g09d2