diff options
Diffstat (limited to '')
| -rw-r--r-- | libblake_internal_blake2xs_init0.c | 76 |
1 files changed, 51 insertions, 25 deletions
diff --git a/libblake_internal_blake2xs_init0.c b/libblake_internal_blake2xs_init0.c index 92cb7bf..f20bb9c 100644 --- a/libblake_internal_blake2xs_init0.c +++ b/libblake_internal_blake2xs_init0.c @@ -1,6 +1,21 @@ /* See LICENSE file for copyright and license details. */ #include "common.h" +#if defined(LITTLE_ENDIAN) +# define le32(X) X +#else +static uint_least32_t +le32(uint_least32_t h) +{ + unsigned char r[4]; + r[0] = (unsigned char)((h >> 0) & 255); + r[1] = (unsigned char)((h >> 8) & 255); + r[2] = (unsigned char)((h >> 16) & 255); + r[3] = (unsigned char)((h >> 24) & 255); + return *(uint_least32_t *)r; +} +#endif + void libblake_internal_blake2xs_init0(struct libblake_blake2xs_state *state, const struct libblake_blake2xs_params *params) { @@ -18,29 +33,40 @@ libblake_internal_blake2xs_init0(struct libblake_blake2xs_state *state, const st state->b2s.f[0] = 0; state->b2s.f[1] = 0; - state->b2s.h[0] ^= ((uint_least32_t)params->digest_len & 255) << 0; - state->b2s.h[0] ^= ((uint_least32_t)params->key_len & 255) << 8; - state->b2s.h[0] ^= ((uint_least32_t)params->fanout & 255) << 16; - state->b2s.h[0] ^= ((uint_least32_t)params->depth & 255) << 24; - state->b2s.h[1] ^= params->leaf_len & UINT_LEAST32_C(0xFFFFffff); - state->b2s.h[2] ^= params->node_offset & UINT_LEAST32_C(0xFFFFffff); - state->b2s.h[3] ^= (uint_least32_t)(params->xof_len & UINT_LEAST16_C(0xFFFF)) << 0; - state->b2s.h[3] ^= ((uint_least32_t)params->node_depth & 255) << 16; - state->b2s.h[3] ^= ((uint_least32_t)params->inner_len & 255) << 24; - state->b2s.h[4] ^= ((uint_least32_t)params->salt[0] & 255) << 0; - state->b2s.h[4] ^= ((uint_least32_t)params->salt[1] & 255) << 8; - state->b2s.h[4] ^= ((uint_least32_t)params->salt[2] & 255) << 16; - state->b2s.h[4] ^= ((uint_least32_t)params->salt[3] & 255) << 24; - state->b2s.h[5] ^= ((uint_least32_t)params->salt[4] & 255) << 0; - state->b2s.h[5] ^= ((uint_least32_t)params->salt[5] & 255) << 8; - state->b2s.h[5] ^= ((uint_least32_t)params->salt[6] & 255) << 16; - state->b2s.h[5] ^= ((uint_least32_t)params->salt[7] & 255) << 24; - state->b2s.h[6] ^= ((uint_least32_t)params->pepper[0] & 255) << 0; - state->b2s.h[6] ^= ((uint_least32_t)params->pepper[1] & 255) << 8; - state->b2s.h[6] ^= ((uint_least32_t)params->pepper[2] & 255) << 16; - state->b2s.h[6] ^= ((uint_least32_t)params->pepper[3] & 255) << 24; - state->b2s.h[7] ^= ((uint_least32_t)params->pepper[4] & 255) << 0; - state->b2s.h[7] ^= ((uint_least32_t)params->pepper[5] & 255) << 8; - state->b2s.h[7] ^= ((uint_least32_t)params->pepper[6] & 255) << 16; - state->b2s.h[7] ^= ((uint_least32_t)params->pepper[7] & 255) << 24; + if (sizeof(*params) == sizeof(state->b2s.h)) { + state->b2s.h[0] ^= le32(((uint_least32_t *)params)[0]); + state->b2s.h[1] ^= le32(((uint_least32_t *)params)[1]); + state->b2s.h[2] ^= le32(((uint_least32_t *)params)[2]); + state->b2s.h[3] ^= le32(((uint_least32_t *)params)[3]); + state->b2s.h[4] ^= le32(((uint_least32_t *)params)[4]); + state->b2s.h[5] ^= le32(((uint_least32_t *)params)[5]); + state->b2s.h[6] ^= le32(((uint_least32_t *)params)[6]); + state->b2s.h[7] ^= le32(((uint_least32_t *)params)[7]); + } else { + state->b2s.h[0] ^= ((uint_least32_t)params->digest_len & 255) << 0; + state->b2s.h[0] ^= ((uint_least32_t)params->key_len & 255) << 8; + state->b2s.h[0] ^= ((uint_least32_t)params->fanout & 255) << 16; + state->b2s.h[0] ^= ((uint_least32_t)params->depth & 255) << 24; + state->b2s.h[1] ^= params->leaf_len & UINT_LEAST32_C(0xFFFFffff); + state->b2s.h[2] ^= params->node_offset & UINT_LEAST32_C(0xFFFFffff); + state->b2s.h[3] ^= (uint_least32_t)(params->xof_len & UINT_LEAST16_C(0xFFFF)) << 0; + state->b2s.h[3] ^= ((uint_least32_t)params->node_depth & 255) << 16; + state->b2s.h[3] ^= ((uint_least32_t)params->inner_len & 255) << 24; + state->b2s.h[4] ^= ((uint_least32_t)params->salt[0] & 255) << 0; + state->b2s.h[4] ^= ((uint_least32_t)params->salt[1] & 255) << 8; + state->b2s.h[4] ^= ((uint_least32_t)params->salt[2] & 255) << 16; + state->b2s.h[4] ^= ((uint_least32_t)params->salt[3] & 255) << 24; + state->b2s.h[5] ^= ((uint_least32_t)params->salt[4] & 255) << 0; + state->b2s.h[5] ^= ((uint_least32_t)params->salt[5] & 255) << 8; + state->b2s.h[5] ^= ((uint_least32_t)params->salt[6] & 255) << 16; + state->b2s.h[5] ^= ((uint_least32_t)params->salt[7] & 255) << 24; + state->b2s.h[6] ^= ((uint_least32_t)params->pepper[0] & 255) << 0; + state->b2s.h[6] ^= ((uint_least32_t)params->pepper[1] & 255) << 8; + state->b2s.h[6] ^= ((uint_least32_t)params->pepper[2] & 255) << 16; + state->b2s.h[6] ^= ((uint_least32_t)params->pepper[3] & 255) << 24; + state->b2s.h[7] ^= ((uint_least32_t)params->pepper[4] & 255) << 0; + state->b2s.h[7] ^= ((uint_least32_t)params->pepper[5] & 255) << 8; + state->b2s.h[7] ^= ((uint_least32_t)params->pepper[6] & 255) << 16; + state->b2s.h[7] ^= ((uint_least32_t)params->pepper[7] & 255) << 24; + } } |