diff options
| author | Eric Biggers <ebiggers@google.com> | 2019-03-14 21:20:36 -0700 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2019-03-22 20:57:28 +0800 |
| commit | 29d97dec22dde5d2c4ccb23c50a11e94a5911861 (patch) | |
| tree | 04518f1abf14116f9264c528b193ad25fe94c698 | |
| parent | dcf7b48212c0fab7df69e84fab22d6cb7c8c0fb9 (diff) | |
| download | linux-stable-29d97dec22dde5d2c4ccb23c50a11e94a5911861.tar.gz linux-stable-29d97dec22dde5d2c4ccb23c50a11e94a5911861.tar.bz2 linux-stable-29d97dec22dde5d2c4ccb23c50a11e94a5911861.zip | |
crypto: chacha-generic - use crypto_xor_cpy()
In chacha_docrypt(), use crypto_xor_cpy() instead of crypto_xor().
This avoids having to memcpy() the src buffer to the dst buffer.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/chacha_generic.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c index 90ec0ec1b4f7..a7fae9b73ec4 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -22,18 +22,16 @@ static void chacha_docrypt(u32 *state, u8 *dst, const u8 *src, /* aligned to potentially speed up crypto_xor() */ u8 stream[CHACHA_BLOCK_SIZE] __aligned(sizeof(long)); - if (dst != src) - memcpy(dst, src, bytes); - while (bytes >= CHACHA_BLOCK_SIZE) { chacha_block(state, stream, nrounds); - crypto_xor(dst, stream, CHACHA_BLOCK_SIZE); + crypto_xor_cpy(dst, src, stream, CHACHA_BLOCK_SIZE); bytes -= CHACHA_BLOCK_SIZE; dst += CHACHA_BLOCK_SIZE; + src += CHACHA_BLOCK_SIZE; } if (bytes) { chacha_block(state, stream, nrounds); - crypto_xor(dst, stream, bytes); + crypto_xor_cpy(dst, src, stream, bytes); } } |