wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use xorbufout in chacha

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2023-03-22 18:48:16 +01:00
parent 8fe321d5be
commit aeb4338085
1 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
wolfcrypt/src/chacha.c
View File

@ -202,15 +202,12 @@ int wc_Chacha_SetKey(ChaCha* ctx, const byte* key, word32 keySz)
/** /**
* Converts word into bytes with rotations having been done. * Converts word into bytes with rotations having been done.
*/ */
static WC_INLINE void wc_Chacha_wordtobyte(word32 output[CHACHA_CHUNK_WORDS], static WC_INLINE void wc_Chacha_wordtobyte(word32 x[CHACHA_CHUNK_WORDS],
const word32 input[CHACHA_CHUNK_WORDS]) word32 state[CHACHA_CHUNK_WORDS])
{ {
word32 x[CHACHA_CHUNK_WORDS];
word32 i; word32 i;
for (i = 0; i < CHACHA_CHUNK_WORDS; i++) { XMEMCPY(x, state, CHACHA_CHUNK_BYTES);
x[i] = input[i];
}
for (i = (ROUNDS); i > 0; i -= 2) { for (i = (ROUNDS); i > 0; i -= 2) {
QUARTERROUND(0, 4, 8, 12) QUARTERROUND(0, 4, 8, 12)
@ -224,11 +221,8 @@ static WC_INLINE void wc_Chacha_wordtobyte(word32 output[CHACHA_CHUNK_WORDS],
} }
for (i = 0; i < CHACHA_CHUNK_WORDS; i++) { for (i = 0; i < CHACHA_CHUNK_WORDS; i++) {
x[i] = PLUS(x[i], input[i]); x[i] = PLUS(x[i], state[i]);
} x[i] = LITTLE32(x[i]);
for (i = 0; i < CHACHA_CHUNK_WORDS; i++) {
output[i] = LITTLE32(x[i]);
} }
} }
@ -334,36 +328,33 @@ extern void chacha_encrypt_avx2(ChaCha* ctx, const byte* m, byte* c,
static void wc_Chacha_encrypt_bytes(ChaCha* ctx, const byte* m, byte* c, static void wc_Chacha_encrypt_bytes(ChaCha* ctx, const byte* m, byte* c,
word32 bytes) word32 bytes)
{ {
byte* output; union {
word32 temp[CHACHA_CHUNK_WORDS]; /* used to make sure aligned */ byte state[CHACHA_CHUNK_BYTES];
word32 i; word32 state32[CHACHA_CHUNK_WORDS];
wolfssl_word align_word; /* align for xorbufout */
} tmp;
/* handle left overs */ /* handle left overs */
if (bytes > 0 && ctx->left > 0) { if (bytes > 0 && ctx->left > 0) {
wc_Chacha_wordtobyte(temp, ctx->X); /* recreate the stream */ word32 processed = min(bytes, ctx->left);
output = (byte*)temp + CHACHA_CHUNK_BYTES - ctx->left; wc_Chacha_wordtobyte(tmp.state32, ctx->X); /* recreate the stream */
for (i = 0; i < bytes && i < ctx->left; i++) { xorbufout(c, m, tmp.state + CHACHA_CHUNK_BYTES - ctx->left, processed);
c[i] = (byte)(m[i] ^ output[i]); ctx->left -= processed;
}
ctx->left -= i;
/* Used up all of the stream that was left, increment the counter */ /* Used up all of the stream that was left, increment the counter */
if (ctx->left == 0) { if (ctx->left == 0) {
ctx->X[CHACHA_MATRIX_CNT_IV] = ctx->X[CHACHA_MATRIX_CNT_IV] =
PLUSONE(ctx->X[CHACHA_MATRIX_CNT_IV]); PLUSONE(ctx->X[CHACHA_MATRIX_CNT_IV]);
} }
bytes -= i; bytes -= processed;
c += i; c += processed;
m += i; m += processed;
} }
output = (byte*)temp;
while (bytes >= CHACHA_CHUNK_BYTES) { while (bytes >= CHACHA_CHUNK_BYTES) {
wc_Chacha_wordtobyte(temp, ctx->X); wc_Chacha_wordtobyte(tmp.state32, ctx->X);
ctx->X[CHACHA_MATRIX_CNT_IV] = PLUSONE(ctx->X[CHACHA_MATRIX_CNT_IV]); ctx->X[CHACHA_MATRIX_CNT_IV] = PLUSONE(ctx->X[CHACHA_MATRIX_CNT_IV]);
for (i = 0; i < CHACHA_CHUNK_BYTES; ++i) { xorbufout(c, m, tmp.state, CHACHA_CHUNK_BYTES);
c[i] = (byte)(m[i] ^ output[i]);
}
bytes -= CHACHA_CHUNK_BYTES; bytes -= CHACHA_CHUNK_BYTES;
c += CHACHA_CHUNK_BYTES; c += CHACHA_CHUNK_BYTES;
m += CHACHA_CHUNK_BYTES; m += CHACHA_CHUNK_BYTES;
@ -373,11 +364,9 @@ static void wc_Chacha_encrypt_bytes(ChaCha* ctx, const byte* m, byte* c,
/* in this case there will always be some left over since bytes is less /* in this case there will always be some left over since bytes is less
* than CHACHA_CHUNK_BYTES, so do not increment counter after getting * than CHACHA_CHUNK_BYTES, so do not increment counter after getting
* stream in order for the stream to be recreated on next call */ * stream in order for the stream to be recreated on next call */
wc_Chacha_wordtobyte(temp, ctx->X); wc_Chacha_wordtobyte(tmp.state32, ctx->X);
for (i = 0; i < bytes; ++i) { xorbufout(c, m, tmp.state, bytes);
c[i] = m[i] ^ output[i]; ctx->left = CHACHA_CHUNK_BYTES - bytes;
}
ctx->left = CHACHA_CHUNK_BYTES - i;
} }
} }
@ -394,17 +383,14 @@ int wc_Chacha_Process(ChaCha* ctx, byte* output, const byte* input,
/* handle left overs */ /* handle left overs */
if (msglen > 0 && ctx->left > 0) { if (msglen > 0 && ctx->left > 0) {
byte* out; byte* out;
word32 i; word32 processed = min(msglen, ctx->left);
out = (byte*)ctx->over + CHACHA_CHUNK_BYTES - ctx->left; out = (byte*)ctx->over + CHACHA_CHUNK_BYTES - ctx->left;
for (i = 0; i < msglen && i < ctx->left; i++) { xorbufout(output, input, out, processed);
output[i] = (byte)(input[i] ^ out[i]); ctx->left -= processed;
} msglen -= processed;
ctx->left -= i; output += processed;
input += processed;
msglen -= i;
output += i;
input += i;
} }
if (msglen == 0) { if (msglen == 0) {