diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2017-03-07 00:22:51 -0700 |
| commit | 07d045372921bfaa843ea00749c150b099ca0a49 (patch) | |
| tree | f849e8432047d3e0fc04590ddfb6a76ba953f9b6 /crypto/cbc.c | |
| parent | 1bd9a34ffdd5f22ef74ed68b5d8b6fb4b781d58c (diff) | |
| parent | 4c6427919ee920d5963cf826de76292286342aa0 (diff) | |
| download | linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.tar.gz linux-crypto-07d045372921bfaa843ea00749c150b099ca0a49.zip | |
Merge tag 'v4.11-rc1' into docs-next
Linux 4.11-rc1
Diffstat (limited to 'crypto/cbc.c')
| -rw-r--r-- | crypto/cbc.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/crypto/cbc.c b/crypto/cbc.c index 68f751a4..bc160a31 100644 --- a/crypto/cbc.c +++ b/crypto/cbc.c @@ -145,9 +145,6 @@ static int crypto_cbc_create(struct crypto_template *tmpl, struct rtattr **tb) inst->alg.base.cra_blocksize = alg->cra_blocksize; inst->alg.base.cra_alignmask = alg->cra_alignmask; - /* We access the data as u32s when xoring. */ - inst->alg.base.cra_alignmask |= __alignof__(u32) - 1; - inst->alg.ivsize = alg->cra_blocksize; inst->alg.min_keysize = alg->cra_cipher.cia_min_keysize; inst->alg.max_keysize = alg->cra_cipher.cia_max_keysize; |