Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / crypto / ccm.c

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 006d8575ef5c71b5ca5f43f35c93a636ce74c618..26b924d1e5826d5779e28905e8f7ac2622df2749 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -462,7 +462,7 @@ static int crypto_ccm_init_tfm(struct crypto_aead *tfm)
        if (IS_ERR(cipher))
                return PTR_ERR(cipher);
 
-       ctr = crypto_spawn_skcipher2(&ictx->ctr);
+       ctr = crypto_spawn_skcipher(&ictx->ctr);
        err = PTR_ERR(ctr);
        if (IS_ERR(ctr))
                goto err_free_cipher;
@@ -544,9 +544,9 @@ static int crypto_ccm_create_common(struct crypto_template *tmpl,
                goto err_free_inst;
 
        crypto_set_skcipher_spawn(&ictx->ctr, aead_crypto_instance(inst));
-       err = crypto_grab_skcipher2(&ictx->ctr, ctr_name, 0,
-                                   crypto_requires_sync(algt->type,
-                                                        algt->mask));
+       err = crypto_grab_skcipher(&ictx->ctr, ctr_name, 0,
+                                  crypto_requires_sync(algt->type,
+                                                       algt->mask));
        if (err)
                goto err_drop_cipher;