From 4672f5dde79b62aef7f0e16b53c4601919f8307d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Sat, 31 Mar 2012 23:02:11 +0200 Subject: [PATCH] Use LE_READ_UINT32. --- ChangeLog | 3 +++ salsa20.c | 29 ++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f8f2aa9..7ceffa15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,9 @@ * salsa20.c: (salsa20_set_iv): Deleted size argument, only one size allowed. + (U8TO32_LITTLE): Deleted macro. Use LE_READ_UINT32 instead, which + avoids unaligned reads. + * nettle-internal.c (salsa20_set_key_hack): Updated salsa20_set_iv call. * testsuite/salsa20-test.c (test_salsa20): Deleted iv_length diff --git a/salsa20.c b/salsa20.c index 4627637d..c93d4733 100644 --- a/salsa20.c +++ b/salsa20.c @@ -49,7 +49,6 @@ #define U32TO32_LITTLE(v) (v) #endif -#define U8TO32_LITTLE(p) U32TO32_LITTLE(((uint32_t*)(p))[0]) #define U32TO8_LITTLE(p, v) (((uint32_t*)(p))[0] = U32TO32_LITTLE(v)) static void salsa20_wordtobyte(uint8_t output[SALSA20_BLOCK_SIZE],const uint32_t input[_SALSA20_INPUT_LENGTH]) @@ -107,31 +106,31 @@ salsa20_set_key(struct salsa20_ctx *ctx, assert (length == SALSA20_MIN_KEY_SIZE || length == SALSA20_MAX_KEY_SIZE); - ctx->input[1] = U8TO32_LITTLE(key + 0); - ctx->input[2] = U8TO32_LITTLE(key + 4); - ctx->input[3] = U8TO32_LITTLE(key + 8); - ctx->input[4] = U8TO32_LITTLE(key + 12); + ctx->input[1] = LE_READ_UINT32(key + 0); + ctx->input[2] = LE_READ_UINT32(key + 4); + ctx->input[3] = LE_READ_UINT32(key + 8); + ctx->input[4] = LE_READ_UINT32(key + 12); if (length == SALSA20_MAX_KEY_SIZE) { /* recommended */ key += 16; constants = sigma; } else { /* kbits == 128 */ constants = tau; } - ctx->input[11] = U8TO32_LITTLE(key + 0); - ctx->input[12] = U8TO32_LITTLE(key + 4); - ctx->input[13] = U8TO32_LITTLE(key + 8); - ctx->input[14] = U8TO32_LITTLE(key + 12); - ctx->input[0] = U8TO32_LITTLE(constants + 0); - ctx->input[5] = U8TO32_LITTLE(constants + 4); - ctx->input[10] = U8TO32_LITTLE(constants + 8); - ctx->input[15] = U8TO32_LITTLE(constants + 12); + ctx->input[11] = LE_READ_UINT32(key + 0); + ctx->input[12] = LE_READ_UINT32(key + 4); + ctx->input[13] = LE_READ_UINT32(key + 8); + ctx->input[14] = LE_READ_UINT32(key + 12); + ctx->input[0] = LE_READ_UINT32(constants + 0); + ctx->input[5] = LE_READ_UINT32(constants + 4); + ctx->input[10] = LE_READ_UINT32(constants + 8); + ctx->input[15] = LE_READ_UINT32(constants + 12); } void salsa20_set_iv(struct salsa20_ctx *ctx, const uint8_t *iv) { - ctx->input[6] = U8TO32_LITTLE(iv + 0); - ctx->input[7] = U8TO32_LITTLE(iv + 4); + ctx->input[6] = LE_READ_UINT32(iv + 0); + ctx->input[7] = LE_READ_UINT32(iv + 4); ctx->input[8] = 0; ctx->input[9] = 0; } -- GitLab