diff options
| author | James Morris <james.l.morris@oracle.com> | 2017-09-24 22:41:55 -0700 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2017-09-24 22:41:55 -0700 |
| commit | fe6ec4634c4b41ea65f055ea709a6f3d5bf67bec (patch) | |
| tree | 9ba289bdd8831b061743a8d48b13e6128306b8f1 /crypto/ctr.c | |
| parent | f960b5ebd9ed09bc12e10c712bce82ab58ef0435 (diff) | |
| parent | 508f8d23a372beae647185ce896a0c1109406b83 (diff) | |
| download | linux-crypto-fe6ec4634c4b41ea65f055ea709a6f3d5bf67bec.tar.gz linux-crypto-fe6ec4634c4b41ea65f055ea709a6f3d5bf67bec.zip | |
Merge tag 'v4.14-rc2' into next-general
Linux 4.14-rc2
Sync to v4.14-rc2 for security subsystem developers to track.
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); } |