aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/chacha.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/crypto/chacha.c')
-rw-r--r--lib/crypto/chacha.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/crypto/chacha.c b/lib/crypto/chacha.c
index a7f5eb091839..ae50e441f9fb 100644
--- a/lib/crypto/chacha.c
+++ b/lib/crypto/chacha.c
@@ -76,11 +76,9 @@ static void chacha_permute(struct chacha_state *state, int nrounds)
*/
void chacha_block_generic(struct chacha_state *state, u8 *stream, int nrounds)
{
- struct chacha_state permuted_state;
+ struct chacha_state permuted_state = *state;
int i;
- memcpy(permuted_state.x, state->x, 64);
-
chacha_permute(&permuted_state, nrounds);
for (i = 0; i < ARRAY_SIZE(state->x); i++)
@@ -105,9 +103,7 @@ EXPORT_SYMBOL(chacha_block_generic);
void hchacha_block_generic(const struct chacha_state *state,
u32 *stream, int nrounds)
{
- struct chacha_state permuted_state;
-
- memcpy(permuted_state.x, state->x, 64);
+ struct chacha_state permuted_state = *state;
chacha_permute(&permuted_state, nrounds);