diff options
| author | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
|---|---|---|
| committer | Juergen Gross <jgross@suse.com> | 2018-01-29 15:54:46 +0100 |
| commit | fe8cbbbc0e68dad845f72ad75c8099b88f7ff049 (patch) | |
| tree | 2bf17da93b86508fe2f66e87f39897a1d4b403dc /crypto/salsa20_generic.c | |
| parent | 40248a5f572a9ee5602fb61b33ddcc7de3b4cf5b (diff) | |
| parent | 21864b027d847a6d91903a5ba219770403ba8aad (diff) | |
| download | linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.tar.gz linux-crypto-fe8cbbbc0e68dad845f72ad75c8099b88f7ff049.zip | |
Merge branch 'master' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Diffstat (limited to 'crypto/salsa20_generic.c')
| -rw-r--r-- | crypto/salsa20_generic.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crypto/salsa20_generic.c b/crypto/salsa20_generic.c index f550b5d9..d7da0eea 100644 --- a/crypto/salsa20_generic.c +++ b/crypto/salsa20_generic.c @@ -188,13 +188,6 @@ static int encrypt(struct blkcipher_desc *desc, salsa20_ivsetup(ctx, walk.iv); - if (likely(walk.nbytes == nbytes)) - { - salsa20_encrypt_bytes(ctx, walk.dst.virt.addr, - walk.src.virt.addr, nbytes); - return blkcipher_walk_done(desc, &walk, 0); - } - while (walk.nbytes >= 64) { salsa20_encrypt_bytes(ctx, walk.dst.virt.addr, walk.src.virt.addr, |