diff options
| author | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-02-07 16:44:43 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | 2019-02-07 16:44:43 +0100 |
| commit | fa52b9919271e59a73b989df5c92bbf0bb983c3d (patch) | |
| tree | ad35f7c066ef1e52febbbfc0fc62fe9623cc4e00 /crypto/salsa20_generic.c | |
| parent | 6e603ea6e028001e3d56dc56822cb9c1cf2908f9 (diff) | |
| parent | bc2a1ca9b6b0c50decebcbb4c6b4160cf81eed93 (diff) | |
| download | linux-crypto-fa52b9919271e59a73b989df5c92bbf0bb983c3d.tar.gz linux-crypto-fa52b9919271e59a73b989df5c92bbf0bb983c3d.zip | |
Merge tag 'v5.0-rc5' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into fbdev-for-next
Linux 5.0-rc5
Sync with upstream (which now contains fbdev-v5.0-rc3 changes) to
prepare a base for fbdev-v5.1 changes.
Diffstat (limited to 'crypto/salsa20_generic.c')
| -rw-r--r-- | crypto/salsa20_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c index 8c77bc78..00fce32a 100644 --- a/crypto/salsa20_generic.c +++ b/crypto/salsa20_generic.c @@ -159,7 +159,7 @@ static int salsa20_crypt(struct skcipher_request *req) u32 state[16]; int err; - err = skcipher_walk_virt(&walk, req, true); + err = skcipher_walk_virt(&walk, req, false); salsa20_init(state, ctx, walk.iv); |