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/ctr.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/ctr.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/crypto/ctr.c b/crypto/ctr.c index 435b75bd..30f3946e 100644 --- a/crypto/ctr.c +++ b/crypto/ctr.c @@ -233,8 +233,6 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb) inst->alg.cra_blkcipher.encrypt = crypto_ctr_crypt; inst->alg.cra_blkcipher.decrypt = crypto_ctr_crypt; - inst->alg.cra_blkcipher.geniv = "chainiv"; - out: crypto_mod_put(alg); return inst; |