From 9a96bdc4b3a5096f274d6cc73fda551b9b548635 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 25 Nov 2015 15:58:05 +0100 Subject: [PATCH] Don't use C99 when it's not required --- .../chacha20/vec/stream_chacha20_vec.c | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c b/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c index ea63c9eb..88f435b0 100644 --- a/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c +++ b/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c @@ -115,23 +115,19 @@ typedef struct chacha_ctx chacha_ctx; static void chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint64_t ic) { - ctx->s3 = (vec) { - ic, - ic >> 32, - ((uint32_t *) iv)[0], - ((uint32_t *) iv)[1] - }; + ctx->s3[0] = (uint32_t) ic; + ctx->s3[1] = (uint32_t) (ic >> 32); + ctx->s3[2] = ((uint32_t *) iv)[0]; + ctx->s3[3] = ((uint32_t *) iv)[1]; } static void chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint32_t ic) { - ctx->s3 = (vec) { - ic, - ((uint32_t *) iv)[0], - ((uint32_t *) iv)[1], - ((uint32_t *) iv)[2] - }; + ctx->s3[0] = ic; + ctx->s3[1] = ((uint32_t *) iv)[0]; + ctx->s3[2] = ((uint32_t *) iv)[1]; + ctx->s3[3] = ((uint32_t *) iv)[2]; } static void