diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-28 22:27:45 +0100 |
| commit | fab2e030f9729c89dbcf6392f4c4a25105c9cbfa (patch) | |
| tree | 0c954c437b1d5ea174af19cda413f0bbe3a60949 /crypto/blkcipher.c | |
| parent | 9a9f3c8647eaaac118d55ad74a10eef558d2a557 (diff) | |
| parent | fed2c5aea5e362f1ff83b27cfd4b50d858377a5f (diff) | |
| download | linux-crypto-fab2e030f9729c89dbcf6392f4c4a25105c9cbfa.tar.gz linux-crypto-fab2e030f9729c89dbcf6392f4c4a25105c9cbfa.zip | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'crypto/blkcipher.c')
| -rw-r--r-- | crypto/blkcipher.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c index d70a41c0..90d26c91 100644 --- a/crypto/blkcipher.c +++ b/crypto/blkcipher.c @@ -521,7 +521,7 @@ static int crypto_grab_nivcipher(struct crypto_skcipher_spawn *spawn, int err; type = crypto_skcipher_type(type); - mask = crypto_skcipher_mask(mask) | CRYPTO_ALG_GENIV; + mask = crypto_skcipher_mask(mask)| CRYPTO_ALG_GENIV; alg = crypto_alg_mod_lookup(name, type, mask); if (IS_ERR(alg)) |