Commit 32c95411 authored by Eric Biggers's avatar Eric Biggers Committed by Herbert Xu
Browse files

crypto: lib/chacha - use struct assignment to copy state 



Use struct assignment instead of memcpy() in lib/crypto/chacha.c where
appropriate.  No functional change.

Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 98066f2f

lib/crypto/chacha.c

+2 −6
Original line number Diff line number Diff line
@@ -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);