diff options
| author | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2017-11-13 10:24:50 +0100 |
| commit | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (patch) | |
| tree | b443b237fa80f2cc8ca8510b63aaa4861ba3ea7a /crypto/ctr.c | |
| parent | 4f673910a79f5cb0e7dd87bf807eebb24834cea3 (diff) | |
| parent | 37d98457e3c414a1673bf5dce97eb4c79b5cff25 (diff) | |
| download | linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.tar.gz linux-crypto-40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b.zip | |
Merge tag 'v4.14' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Linux 4.14
Diffstat (limited to 'crypto/ctr.c')
| -rw-r--r-- | crypto/ctr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/crypto/ctr.c b/crypto/ctr.c index 477d9226..854d924f 100644 --- a/crypto/ctr.c +++ b/crypto/ctr.c @@ -65,8 +65,7 @@ static void crypto_ctr_crypt_final(struct blkcipher_walk *walk, unsigned int nbytes = walk->nbytes; crypto_cipher_encrypt_one(tfm, keystream, ctrblk); - crypto_xor(keystream, src, nbytes); - memcpy(dst, keystream, nbytes); + crypto_xor_cpy(dst, keystream, src, nbytes); crypto_inc(ctrblk, bsize); } |