Lucas/lilcrypto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cipher/chacha20: buffer the full input block

Browse Source 
The final implementation is simpler, at the cost of doing work in
chacha20_x_final.
This commit is contained in:
Lucas Gabriel Vuotto 2024-06-07 00:29:17 +00:00
parent 5bd46fffa6
commit e5215ac18e
2 changed files with 55 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
cipher_chacha20.c
View File

@ -42,7 +42,7 @@ chacha20_x_init_from(void *arg, const uint8_t *key, size_t keylen,
ctx->c = counter; ctx->c = counter;
for (i = 0; i < CHACHA20_NONCE_WORDS; i++) for (i = 0; i < CHACHA20_NONCE_WORDS; i++)
ctx->n[i] = load32le(&iv[i * 4]); ctx->n[i] = load32le(&iv[i * 4]);
ctx->blen = 0; ctx->mlen = 0;
return 1; return 1;
} }
@ -59,50 +59,42 @@ chacha20_x_update(void *arg, uint8_t *out, size_t *outlen, const uint8_t *in,
size_t inlen) size_t inlen)
{ {
struct chacha20_ctx *ctx = arg; struct chacha20_ctx *ctx = arg;
size_t i, blocks;
uint32_t h; uint32_t h;
uint8_t s[4];
size_t i, blocks, off, pad;
*outlen = 0; *outlen = 0;
if (inlen > SIZE_MAX - (CHACHA20_CHUNK - 1) - ctx->blen) if (inlen > SIZE_MAX - (CHACHA20_CHUNK - 1) - ctx->mlen)
return 0; return 0;
blocks = inlen + ctx->blen + CHACHA20_CHUNK - 1; blocks = (inlen + ctx->mlen + CHACHA20_CHUNK - 1) / CHACHA20_CHUNK;
if (blocks / CHACHA20_CHUNK + ctx->c > CHACHA20_CTRMAX) if (blocks + ctx->c > CHACHA20_CTRMAX)
return 0; return 0;
if (out == NULL) { *outlen = (ctx->mlen + inlen) / CHACHA20_CHUNK * CHACHA20_CHUNK;
*outlen = inlen; if (out == NULL)
return 1; return 1;
}
*outlen = inlen; for (i = 0; i + ctx->mlen < CHACHA20_CHUNK && i < inlen; i++)
ctx->m[i + ctx->mlen] = in[i];
if (ctx->blen == 0) ctx->mlen += i;
goto fullblock;
off = ctx->blen % 4;
if (off != 0) {
store32le(s, ctx->s[ctx->blen / 4]);
for (i = 0; i + off < 4 && i < inlen; i++)
out[i] = in[i] ^ s[i + off];
ctx->blen += i;
out += i;
in += i; in += i;
inlen -= i; inlen -= i;
}
pad = inlen % 4; if (ctx->mlen == CHACHA20_CHUNK) {
for (i = 0; i + ctx->blen < CHACHA20_CHUNK && i < inlen - pad; i += 4) { chacha20_block(ctx);
h = load32le(&in[i * 4]); ctx->c++;
h ^= ctx->s[(i + ctx->blen) / 4];
for (i = 0; i < CHACHA20_CHUNK_WORDS; i++) {
h = load32le(&ctx->m[i * 4]);
h ^= ctx->s[i];
store32le(&out[i * 4], h); store32le(&out[i * 4], h);
} }
ctx->blen += i * 4; out += CHACHA20_CHUNK;
out += i * 4; ctx->mlen = 0;
in += i * 4; }
inlen -= i * 4;
if (inlen == 0)
return 1;
fullblock:
while (inlen >= CHACHA20_CHUNK) { while (inlen >= CHACHA20_CHUNK) {
chacha20_block(ctx); chacha20_block(ctx);
ctx->c++; ctx->c++;
@ -117,23 +109,9 @@ chacha20_x_update(void *arg, uint8_t *out, size_t *outlen, const uint8_t *in,
inlen -= CHACHA20_CHUNK; inlen -= CHACHA20_CHUNK;
} }
chacha20_block(ctx); for (i = 0; i < inlen; i++)
ctx->c++; ctx->m[i] = in[i];
ctx->blen = inlen; ctx->mlen = inlen;
pad = inlen % 4;
for (i = 0; i < (inlen - pad) / 4; i++) {
h = load32le(&in[i * 4]);
h ^= ctx->s[i];
store32le(&out[i * 4], h);
}
out += i * 4;
in += i * 4;
inlen -= i * 4;
store32le(s, ctx->s[i]);
for (i = 0; i < pad; i++)
out[i] = in[i] ^ s[i];
return 1; return 1;
} }
@ -142,8 +120,30 @@ int
chacha20_x_final(void *arg, uint8_t *out, size_t *outlen) chacha20_x_final(void *arg, uint8_t *out, size_t *outlen)
{ {
struct chacha20_ctx *ctx = arg; struct chacha20_ctx *ctx = arg;
size_t i, off;
uint32_t h;
uint8_t s[4];
*outlen = ctx->mlen;
if (out == NULL)
return 1;
if (ctx->mlen > 0)
chacha20_block(ctx);
for (i = 0; i < ctx->mlen / 4; i++) {
h = load32le(&ctx->m[i * 4]);
h ^= ctx->s[i];
store32le(&out[i * 4], h);
}
off = i * 4;
ctx->mlen -= off;
out += off;
store32le(&s[0], ctx->s[i]);
for (i = 0; i < ctx->mlen; i++)
out[i] = ctx->m[i + off] ^ s[i];
*outlen = 0;
lc_scrub(ctx, sizeof(*ctx)); lc_scrub(ctx, sizeof(*ctx));
return 1; return 1;

3
impl_chacha20.h
View File

@ -33,7 +33,8 @@ struct chacha20_ctx {
uint32_t k[CHACHA20_KEY_WORDS]; uint32_t k[CHACHA20_KEY_WORDS];
uint32_t c; uint32_t c;
uint32_t n[CHACHA20_NONCE_WORDS]; uint32_t n[CHACHA20_NONCE_WORDS];
size_t blen; size_t mlen;
uint8_t m[CHACHA20_CHUNK];
}; };