Don't use C99 when it's not required

This commit is contained in:
Frank Denis 2015-11-25 15:58:05 +01:00
parent 8011838dcd
commit 9a96bdc4b3

View File

@ -115,23 +115,19 @@ typedef struct chacha_ctx chacha_ctx;
static void static void
chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint64_t ic) chacha_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint64_t ic)
{ {
ctx->s3 = (vec) { ctx->s3[0] = (uint32_t) ic;
ic, ctx->s3[1] = (uint32_t) (ic >> 32);
ic >> 32, ctx->s3[2] = ((uint32_t *) iv)[0];
((uint32_t *) iv)[0], ctx->s3[3] = ((uint32_t *) iv)[1];
((uint32_t *) iv)[1]
};
} }
static void static void
chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint32_t ic) chacha_ietf_ivsetup(chacha_ctx *ctx, const uint8_t *iv, uint32_t ic)
{ {
ctx->s3 = (vec) { ctx->s3[0] = ic;
ic, ctx->s3[1] = ((uint32_t *) iv)[0];
((uint32_t *) iv)[0], ctx->s3[2] = ((uint32_t *) iv)[1];
((uint32_t *) iv)[1], ctx->s3[3] = ((uint32_t *) iv)[2];
((uint32_t *) iv)[2]
};
} }
static void static void