diff options
| author | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-01-09 12:20:41 +0000 |
| commit | 0d6c1ba342ec528e952c4c99833cd4802918f9c7 (patch) | |
| tree | 3f9b77b397ec915c0eb026a9b6425e82fa843e67 /crypto/ctr.c | |
| parent | 3e39d71f9e785538cfb91cd75e7f169bb2a34d5b (diff) | |
| parent | 46cc85f2e4aef88c237a0407cf5d163619a4d565 (diff) | |
| download | linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.tar.gz linux-crypto-0d6c1ba342ec528e952c4c99833cd4802918f9c7.zip | |
Merge tag 'v4.10-rc1' into spi-s3c64xx
Linux 4.10-rc1
Diffstat (limited to 'crypto/ctr.c')
| -rw-r--r-- | crypto/ctr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crypto/ctr.c b/crypto/ctr.c index ff4d21ed..a9a7a44f 100644 --- a/crypto/ctr.c +++ b/crypto/ctr.c @@ -312,7 +312,7 @@ static int crypto_rfc3686_init_tfm(struct crypto_skcipher *tfm) unsigned long align; unsigned int reqsize; - cipher = crypto_spawn_skcipher2(spawn); + cipher = crypto_spawn_skcipher(spawn); if (IS_ERR(cipher)) return PTR_ERR(cipher); @@ -370,9 +370,9 @@ static int crypto_rfc3686_create(struct crypto_template *tmpl, spawn = skcipher_instance_ctx(inst); crypto_set_skcipher_spawn(spawn, skcipher_crypto_instance(inst)); - err = crypto_grab_skcipher2(spawn, cipher_name, 0, - crypto_requires_sync(algt->type, - algt->mask)); + err = crypto_grab_skcipher(spawn, cipher_name, 0, + crypto_requires_sync(algt->type, + algt->mask)); if (err) goto err_free_inst; |