diff options
| author | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2019-01-10 11:41:59 -0800 |
| commit | 7ff17fe228094bad025c79c39e9e23af4364644c (patch) | |
| tree | 05dc0dd252df9b5e3ed8e4429dc5f31c070e0f23 /crypto/salsa20_generic.c | |
| parent | 7271e588c712517a184f75744b6e94d05c8251a4 (diff) | |
| parent | 9b882a6a998381cc1ea34edef55b8a6315114b7b (diff) | |
| download | linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.tar.gz linux-crypto-7ff17fe228094bad025c79c39e9e23af4364644c.zip | |
Merge tag 'v5.0-rc1' into next-general
Linux 5.0-rc1
Sync to pick up LSM stacking work (which is based on -rc1).
Diffstat (limited to '')
| -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); |