cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use C99 when it's not required

Browse Source
This commit is contained in:
Frank Denis 2015-11-25 15:58:05 +01:00
parent 8011838dcd
commit 9a96bdc4b3
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c
View File

@ -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