crypto_alg is not supposed to be directly implemented by crypto engine
driver. Drivers should instead implement specialized interfaces like
ahash_alg or skcipher_alg.

Migrate to all cipher algorithms to the skcipher_alg interface. While at
it, get rid of all references to ablkcipher including in internal struct
or function names.

Signed-off-by: Boris Brezillon <boris.brezil...@free-electrons.com>
---
 drivers/crypto/marvell/cesa.c   |  10 +-
 drivers/crypto/marvell/cesa.h   |  25 ++-
 drivers/crypto/marvell/cipher.c | 476 ++++++++++++++++++++--------------------
 3 files changed, 251 insertions(+), 260 deletions(-)

diff --git a/drivers/crypto/marvell/cesa.c b/drivers/crypto/marvell/cesa.c
index f870825bfbc2..577dc6773fa0 100644
--- a/drivers/crypto/marvell/cesa.c
+++ b/drivers/crypto/marvell/cesa.c
@@ -198,7 +198,7 @@ static int mv_cesa_add_algs(struct mv_cesa_dev *cesa)
        int i, j;
 
        for (i = 0; i < cesa->caps->ncipher_algs; i++) {
-               ret = crypto_register_alg(cesa->caps->cipher_algs[i]);
+               ret = crypto_register_skcipher(cesa->caps->cipher_algs[i]);
                if (ret)
                        goto err_unregister_crypto;
        }
@@ -218,7 +218,7 @@ static int mv_cesa_add_algs(struct mv_cesa_dev *cesa)
 
 err_unregister_crypto:
        for (j = 0; j < i; j++)
-               crypto_unregister_alg(cesa->caps->cipher_algs[j]);
+               crypto_unregister_skcipher(cesa->caps->cipher_algs[j]);
 
        return ret;
 }
@@ -231,10 +231,10 @@ static void mv_cesa_remove_algs(struct mv_cesa_dev *cesa)
                crypto_unregister_ahash(cesa->caps->ahash_algs[i]);
 
        for (i = 0; i < cesa->caps->ncipher_algs; i++)
-               crypto_unregister_alg(cesa->caps->cipher_algs[i]);
+               crypto_unregister_skcipher(cesa->caps->cipher_algs[i]);
 }
 
-static struct crypto_alg *orion_cipher_algs[] = {
+static struct skcipher_alg *orion_cipher_algs[] = {
        &mv_cesa_ecb_des_alg,
        &mv_cesa_cbc_des_alg,
        &mv_cesa_ecb_des3_ede_alg,
@@ -250,7 +250,7 @@ static struct ahash_alg *orion_ahash_algs[] = {
        &mv_ahmac_sha1_alg,
 };
 
-static struct crypto_alg *armada_370_cipher_algs[] = {
+static struct skcipher_alg *armada_370_cipher_algs[] = {
        &mv_cesa_ecb_des_alg,
        &mv_cesa_cbc_des_alg,
        &mv_cesa_ecb_des3_ede_alg,
diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index b7872f62f674..acf81945eb85 100644
--- a/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@ -4,6 +4,7 @@
 #include <crypto/algapi.h>
 #include <crypto/hash.h>
 #include <crypto/internal/hash.h>
+#include <crypto/internal/skcipher.h>
 
 #include <linux/crypto.h>
 #include <linux/dmapool.h>
@@ -372,7 +373,7 @@ struct mv_cesa_engine;
 struct mv_cesa_caps {
        int nengines;
        bool has_tdma;
-       struct crypto_alg **cipher_algs;
+       struct skcipher_alg **cipher_algs;
        int ncipher_algs;
        struct ahash_alg **ahash_algs;
        int nahash_algs;
@@ -538,12 +539,12 @@ struct mv_cesa_sg_std_iter {
 };
 
 /**
- * struct mv_cesa_ablkcipher_std_req - cipher standard request
+ * struct mv_cesa_skcipher_std_req - cipher standard request
  * @op:                operation context
  * @offset:    current operation offset
  * @size:      size of the crypto operation
  */
-struct mv_cesa_ablkcipher_std_req {
+struct mv_cesa_skcipher_std_req {
        struct mv_cesa_op_ctx op;
        unsigned int offset;
        unsigned int size;
@@ -551,14 +552,14 @@ struct mv_cesa_ablkcipher_std_req {
 };
 
 /**
- * struct mv_cesa_ablkcipher_req - cipher request
+ * struct mv_cesa_skcipher_req - cipher request
  * @req:       type specific request information
  * @src_nents: number of entries in the src sg list
  * @dst_nents: number of entries in the dest sg list
  */
-struct mv_cesa_ablkcipher_req {
+struct mv_cesa_skcipher_req {
        struct mv_cesa_req base;
-       struct mv_cesa_ablkcipher_std_req std;
+       struct mv_cesa_skcipher_std_req std;
        int src_nents;
        int dst_nents;
 };
@@ -868,11 +869,11 @@ extern struct ahash_alg mv_ahmac_md5_alg;
 extern struct ahash_alg mv_ahmac_sha1_alg;
 extern struct ahash_alg mv_ahmac_sha256_alg;
 
-extern struct crypto_alg mv_cesa_ecb_des_alg;
-extern struct crypto_alg mv_cesa_cbc_des_alg;
-extern struct crypto_alg mv_cesa_ecb_des3_ede_alg;
-extern struct crypto_alg mv_cesa_cbc_des3_ede_alg;
-extern struct crypto_alg mv_cesa_ecb_aes_alg;
-extern struct crypto_alg mv_cesa_cbc_aes_alg;
+extern struct skcipher_alg mv_cesa_ecb_des_alg;
+extern struct skcipher_alg mv_cesa_cbc_des_alg;
+extern struct skcipher_alg mv_cesa_ecb_des3_ede_alg;
+extern struct skcipher_alg mv_cesa_cbc_des3_ede_alg;
+extern struct skcipher_alg mv_cesa_ecb_aes_alg;
+extern struct skcipher_alg mv_cesa_cbc_aes_alg;
 
 #endif /* __MARVELL_CESA_H__ */
diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index 098871a22a54..0ae84ec9e21c 100644
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -32,23 +32,23 @@ struct mv_cesa_aes_ctx {
        struct crypto_aes_ctx aes;
 };
 
-struct mv_cesa_ablkcipher_dma_iter {
+struct mv_cesa_skcipher_dma_iter {
        struct mv_cesa_dma_iter base;
        struct mv_cesa_sg_dma_iter src;
        struct mv_cesa_sg_dma_iter dst;
 };
 
 static inline void
-mv_cesa_ablkcipher_req_iter_init(struct mv_cesa_ablkcipher_dma_iter *iter,
-                                struct ablkcipher_request *req)
+mv_cesa_skcipher_req_iter_init(struct mv_cesa_skcipher_dma_iter *iter,
+                              struct skcipher_request *req)
 {
-       mv_cesa_req_dma_iter_init(&iter->base, req->nbytes);
+       mv_cesa_req_dma_iter_init(&iter->base, req->cryptlen);
        mv_cesa_sg_dma_iter_init(&iter->src, req->src, DMA_TO_DEVICE);
        mv_cesa_sg_dma_iter_init(&iter->dst, req->dst, DMA_FROM_DEVICE);
 }
 
 static inline bool
-mv_cesa_ablkcipher_req_iter_next_op(struct mv_cesa_ablkcipher_dma_iter *iter)
+mv_cesa_skcipher_req_iter_next_op(struct mv_cesa_skcipher_dma_iter *iter)
 {
        iter->src.op_offset = 0;
        iter->dst.op_offset = 0;
@@ -57,9 +57,9 @@ mv_cesa_ablkcipher_req_iter_next_op(struct 
mv_cesa_ablkcipher_dma_iter *iter)
 }
 
 static inline void
-mv_cesa_ablkcipher_dma_cleanup(struct ablkcipher_request *req)
+mv_cesa_skcipher_dma_cleanup(struct skcipher_request *req)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
 
        if (req->dst != req->src) {
                dma_unmap_sg(cesa_dev->dev, req->dst, creq->dst_nents,
@@ -73,20 +73,20 @@ mv_cesa_ablkcipher_dma_cleanup(struct ablkcipher_request 
*req)
        mv_cesa_dma_cleanup(&creq->base);
 }
 
-static inline void mv_cesa_ablkcipher_cleanup(struct ablkcipher_request *req)
+static inline void mv_cesa_skcipher_cleanup(struct skcipher_request *req)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
 
        if (mv_cesa_req_get_type(&creq->base) == CESA_DMA_REQ)
-               mv_cesa_ablkcipher_dma_cleanup(req);
+               mv_cesa_skcipher_dma_cleanup(req);
 }
 
-static void mv_cesa_ablkcipher_std_step(struct ablkcipher_request *req)
+static void mv_cesa_skcipher_std_step(struct skcipher_request *req)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
-       struct mv_cesa_ablkcipher_std_req *sreq = &creq->std;
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
+       struct mv_cesa_skcipher_std_req *sreq = &creq->std;
        struct mv_cesa_engine *engine = creq->base.engine;
-       size_t  len = min_t(size_t, req->nbytes - sreq->offset,
+       size_t  len = min_t(size_t, req->cryptlen - sreq->offset,
                            CESA_SA_SRAM_PAYLOAD_SIZE);
 
        mv_cesa_adjust_op(engine, &sreq->op);
@@ -114,11 +114,11 @@ static void mv_cesa_ablkcipher_std_step(struct 
ablkcipher_request *req)
        writel(CESA_SA_CMD_EN_CESA_SA_ACCL0, engine->regs + CESA_SA_CMD);
 }
 
-static int mv_cesa_ablkcipher_std_process(struct ablkcipher_request *req,
-                                         u32 status)
+static int mv_cesa_skcipher_std_process(struct skcipher_request *req,
+                                       u32 status)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
-       struct mv_cesa_ablkcipher_std_req *sreq = &creq->std;
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
+       struct mv_cesa_skcipher_std_req *sreq = &creq->std;
        struct mv_cesa_engine *engine = creq->base.engine;
        size_t len;
 
@@ -127,122 +127,130 @@ static int mv_cesa_ablkcipher_std_process(struct 
ablkcipher_request *req,
                                   sreq->size, sreq->offset);
 
        sreq->offset += len;
-       if (sreq->offset < req->nbytes)
+       if (sreq->offset < req->cryptlen)
                return -EINPROGRESS;
 
        return 0;
 }
 
-static int mv_cesa_ablkcipher_process(struct crypto_async_request *req,
-                                     u32 status)
+static int mv_cesa_skcipher_process(struct crypto_async_request *req,
+                                   u32 status)
 {
-       struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
+       struct skcipher_request *skreq = skcipher_request_cast(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(skreq);
        struct mv_cesa_req *basereq = &creq->base;
 
        if (mv_cesa_req_get_type(basereq) == CESA_STD_REQ)
-               return mv_cesa_ablkcipher_std_process(ablkreq, status);
+               return mv_cesa_skcipher_std_process(skreq, status);
 
        return mv_cesa_dma_process(basereq, status);
 }
 
-static void mv_cesa_ablkcipher_step(struct crypto_async_request *req)
+static void mv_cesa_skcipher_step(struct crypto_async_request *req)
 {
-       struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
+       struct skcipher_request *skreq = skcipher_request_cast(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(skreq);
 
        if (mv_cesa_req_get_type(&creq->base) == CESA_DMA_REQ)
                mv_cesa_dma_step(&creq->base);
        else
-               mv_cesa_ablkcipher_std_step(ablkreq);
+               mv_cesa_skcipher_std_step(skreq);
 }
 
 static inline void
-mv_cesa_ablkcipher_dma_prepare(struct ablkcipher_request *req)
+mv_cesa_skcipher_dma_prepare(struct skcipher_request *req)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
        struct mv_cesa_req *basereq = &creq->base;
 
        mv_cesa_dma_prepare(basereq, basereq->engine);
 }
 
 static inline void
-mv_cesa_ablkcipher_std_prepare(struct ablkcipher_request *req)
+mv_cesa_skcipher_std_prepare(struct skcipher_request *req)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
-       struct mv_cesa_ablkcipher_std_req *sreq = &creq->std;
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
+       struct mv_cesa_skcipher_std_req *sreq = &creq->std;
 
        sreq->size = 0;
        sreq->offset = 0;
 }
 
-static inline void mv_cesa_ablkcipher_prepare(struct crypto_async_request *req,
-                                             struct mv_cesa_engine *engine)
+static inline void mv_cesa_skcipher_prepare(struct crypto_async_request *req,
+                                           struct mv_cesa_engine *engine)
 {
-       struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
+       struct skcipher_request *skreq = skcipher_request_cast(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(skreq);
        creq->base.engine = engine;
 
        if (mv_cesa_req_get_type(&creq->base) == CESA_DMA_REQ)
-               mv_cesa_ablkcipher_dma_prepare(ablkreq);
+               mv_cesa_skcipher_dma_prepare(skreq);
        else
-               mv_cesa_ablkcipher_std_prepare(ablkreq);
+               mv_cesa_skcipher_std_prepare(skreq);
 }
 
 static inline void
-mv_cesa_ablkcipher_req_cleanup(struct crypto_async_request *req)
+mv_cesa_skcipher_req_cleanup(struct crypto_async_request *req)
 {
-       struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
+       struct skcipher_request *skreq = skcipher_request_cast(req);
 
-       mv_cesa_ablkcipher_cleanup(ablkreq);
+       mv_cesa_skcipher_cleanup(skreq);
 }
 
 static void
-mv_cesa_ablkcipher_complete(struct crypto_async_request *req)
+mv_cesa_skcipher_complete(struct crypto_async_request *req)
 {
-       struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
+       struct skcipher_request *skreq = skcipher_request_cast(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(skreq);
        struct mv_cesa_engine *engine = creq->base.engine;
        unsigned int ivsize;
 
-       atomic_sub(ablkreq->nbytes, &engine->load);
-       ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(ablkreq));
+       atomic_sub(skreq->cryptlen, &engine->load);
+       ivsize = crypto_skcipher_ivsize(crypto_skcipher_reqtfm(skreq));
 
        if (mv_cesa_req_get_type(&creq->base) == CESA_DMA_REQ) {
                struct mv_cesa_req *basereq;
 
                basereq = &creq->base;
-               memcpy(ablkreq->info, basereq->chain.last->op->ctx.blkcipher.iv,
+               memcpy(skreq->iv, basereq->chain.last->op->ctx.blkcipher.iv,
                       ivsize);
        } else {
-               memcpy_fromio(ablkreq->info,
+               memcpy_fromio(skreq->iv,
                              engine->sram + CESA_SA_CRYPT_IV_SRAM_OFFSET,
                              ivsize);
        }
 }
 
-static const struct mv_cesa_req_ops mv_cesa_ablkcipher_req_ops = {
-       .step = mv_cesa_ablkcipher_step,
-       .process = mv_cesa_ablkcipher_process,
-       .cleanup = mv_cesa_ablkcipher_req_cleanup,
-       .complete = mv_cesa_ablkcipher_complete,
+static const struct mv_cesa_req_ops mv_cesa_skcipher_req_ops = {
+       .step = mv_cesa_skcipher_step,
+       .process = mv_cesa_skcipher_process,
+       .cleanup = mv_cesa_skcipher_req_cleanup,
+       .complete = mv_cesa_skcipher_complete,
 };
 
-static int mv_cesa_ablkcipher_cra_init(struct crypto_tfm *tfm)
+static void mv_cesa_skcipher_cra_exit(struct crypto_tfm *tfm)
 {
-       struct mv_cesa_aes_ctx *ctx = crypto_tfm_ctx(tfm);
+       void *ctx = crypto_tfm_ctx(tfm);
+
+       memzero_explicit(ctx, tfm->__crt_alg->cra_ctxsize);
+}
+
+static int mv_cesa_skcipher_cra_init(struct crypto_tfm *tfm)
+{
+       struct mv_cesa_ctx *ctx = crypto_tfm_ctx(tfm);
 
-       ctx->base.ops = &mv_cesa_ablkcipher_req_ops;
+       ctx->ops = &mv_cesa_skcipher_req_ops;
 
-       tfm->crt_ablkcipher.reqsize = sizeof(struct mv_cesa_ablkcipher_req);
+       crypto_skcipher_set_reqsize(__crypto_skcipher_cast(tfm),
+                                   sizeof(struct mv_cesa_skcipher_req));
 
        return 0;
 }
 
-static int mv_cesa_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
+static int mv_cesa_aes_setkey(struct crypto_skcipher *cipher, const u8 *key,
                              unsigned int len)
 {
-       struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
+       struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);
        struct mv_cesa_aes_ctx *ctx = crypto_tfm_ctx(tfm);
        int remaining;
        int offset;
@@ -251,7 +259,7 @@ static int mv_cesa_aes_setkey(struct crypto_ablkcipher 
*cipher, const u8 *key,
 
        ret = crypto_aes_expand_key(&ctx->aes, key, len);
        if (ret) {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
                return ret;
        }
 
@@ -264,16 +272,16 @@ static int mv_cesa_aes_setkey(struct crypto_ablkcipher 
*cipher, const u8 *key,
        return 0;
 }
 
-static int mv_cesa_des_setkey(struct crypto_ablkcipher *cipher, const u8 *key,
+static int mv_cesa_des_setkey(struct crypto_skcipher *cipher, const u8 *key,
                              unsigned int len)
 {
-       struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
+       struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);
        struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm);
        u32 tmp[DES_EXPKEY_WORDS];
        int ret;
 
        if (len != DES_KEY_SIZE) {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
                return -EINVAL;
        }
 
@@ -288,14 +296,14 @@ static int mv_cesa_des_setkey(struct crypto_ablkcipher 
*cipher, const u8 *key,
        return 0;
 }
 
-static int mv_cesa_des3_ede_setkey(struct crypto_ablkcipher *cipher,
+static int mv_cesa_des3_ede_setkey(struct crypto_skcipher *cipher,
                                   const u8 *key, unsigned int len)
 {
-       struct crypto_tfm *tfm = crypto_ablkcipher_tfm(cipher);
+       struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);
        struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(tfm);
 
        if (len != DES3_EDE_KEY_SIZE) {
-               crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
+               crypto_skcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
                return -EINVAL;
        }
 
@@ -304,14 +312,14 @@ static int mv_cesa_des3_ede_setkey(struct 
crypto_ablkcipher *cipher,
        return 0;
 }
 
-static int mv_cesa_ablkcipher_dma_req_init(struct ablkcipher_request *req,
-                               const struct mv_cesa_op_ctx *op_templ)
+static int mv_cesa_skcipher_dma_req_init(struct skcipher_request *req,
+                                        const struct mv_cesa_op_ctx *op_templ)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
        gfp_t flags = (req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP) ?
                      GFP_KERNEL : GFP_ATOMIC;
        struct mv_cesa_req *basereq = &creq->base;
-       struct mv_cesa_ablkcipher_dma_iter iter;
+       struct mv_cesa_skcipher_dma_iter iter;
        bool skip_ctx = false;
        int ret;
        unsigned int ivsize;
@@ -339,7 +347,7 @@ static int mv_cesa_ablkcipher_dma_req_init(struct 
ablkcipher_request *req,
        }
 
        mv_cesa_tdma_desc_iter_init(&basereq->chain);
-       mv_cesa_ablkcipher_req_iter_init(&iter, req);
+       mv_cesa_skcipher_req_iter_init(&iter, req);
 
        do {
                struct mv_cesa_op_ctx *op;
@@ -370,10 +378,10 @@ static int mv_cesa_ablkcipher_dma_req_init(struct 
ablkcipher_request *req,
                if (ret)
                        goto err_free_tdma;
 
-       } while (mv_cesa_ablkcipher_req_iter_next_op(&iter));
+       } while (mv_cesa_skcipher_req_iter_next_op(&iter));
 
        /* Add output data for IV */
-       ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(req));
+       ivsize = crypto_skcipher_ivsize(crypto_skcipher_reqtfm(req));
        ret = mv_cesa_dma_add_result_op(&basereq->chain, 
CESA_SA_CFG_SRAM_OFFSET,
                                    CESA_SA_DATA_SRAM_OFFSET,
                                    CESA_TDMA_SRC_IN_SRAM, flags);
@@ -399,11 +407,11 @@ static int mv_cesa_ablkcipher_dma_req_init(struct 
ablkcipher_request *req,
 }
 
 static inline int
-mv_cesa_ablkcipher_std_req_init(struct ablkcipher_request *req,
-                               const struct mv_cesa_op_ctx *op_templ)
+mv_cesa_skcipher_std_req_init(struct skcipher_request *req,
+                             const struct mv_cesa_op_ctx *op_templ)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
-       struct mv_cesa_ablkcipher_std_req *sreq = &creq->std;
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
+       struct mv_cesa_skcipher_std_req *sreq = &creq->std;
        struct mv_cesa_req *basereq = &creq->base;
 
        sreq->op = *op_templ;
@@ -414,23 +422,23 @@ mv_cesa_ablkcipher_std_req_init(struct ablkcipher_request 
*req,
        return 0;
 }
 
-static int mv_cesa_ablkcipher_req_init(struct ablkcipher_request *req,
-                                      struct mv_cesa_op_ctx *tmpl)
+static int mv_cesa_skcipher_req_init(struct skcipher_request *req,
+                                    struct mv_cesa_op_ctx *tmpl)
 {
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
-       struct crypto_ablkcipher *tfm = crypto_ablkcipher_reqtfm(req);
-       unsigned int blksize = crypto_ablkcipher_blocksize(tfm);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
+       struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req);
+       unsigned int blksize = crypto_skcipher_blocksize(tfm);
        int ret;
 
-       if (!IS_ALIGNED(req->nbytes, blksize))
+       if (!IS_ALIGNED(req->cryptlen, blksize))
                return -EINVAL;
 
-       creq->src_nents = sg_nents_for_len(req->src, req->nbytes);
+       creq->src_nents = sg_nents_for_len(req->src, req->cryptlen);
        if (creq->src_nents < 0) {
                dev_err(cesa_dev->dev, "Invalid number of src SG");
                return creq->src_nents;
        }
-       creq->dst_nents = sg_nents_for_len(req->dst, req->nbytes);
+       creq->dst_nents = sg_nents_for_len(req->dst, req->cryptlen);
        if (creq->dst_nents < 0) {
                dev_err(cesa_dev->dev, "Invalid number of dst SG");
                return creq->dst_nents;
@@ -440,36 +448,36 @@ static int mv_cesa_ablkcipher_req_init(struct 
ablkcipher_request *req,
                              CESA_SA_DESC_CFG_OP_MSK);
 
        if (cesa_dev->caps->has_tdma)
-               ret = mv_cesa_ablkcipher_dma_req_init(req, tmpl);
+               ret = mv_cesa_skcipher_dma_req_init(req, tmpl);
        else
-               ret = mv_cesa_ablkcipher_std_req_init(req, tmpl);
+               ret = mv_cesa_skcipher_std_req_init(req, tmpl);
 
        return ret;
 }
 
-static int mv_cesa_ablkcipher_queue_req(struct ablkcipher_request *req,
-                                       struct mv_cesa_op_ctx *tmpl)
+static int mv_cesa_skcipher_queue_req(struct skcipher_request *req,
+                                     struct mv_cesa_op_ctx *tmpl)
 {
        int ret;
-       struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(req);
+       struct mv_cesa_skcipher_req *creq = skcipher_request_ctx(req);
        struct mv_cesa_engine *engine;
 
-       ret = mv_cesa_ablkcipher_req_init(req, tmpl);
+       ret = mv_cesa_skcipher_req_init(req, tmpl);
        if (ret)
                return ret;
 
-       engine = mv_cesa_select_engine(req->nbytes);
-       mv_cesa_ablkcipher_prepare(&req->base, engine);
+       engine = mv_cesa_select_engine(req->cryptlen);
+       mv_cesa_skcipher_prepare(&req->base, engine);
 
        ret = mv_cesa_queue_req(&req->base, &creq->base);
 
        if (mv_cesa_req_needs_cleanup(&req->base, ret))
-               mv_cesa_ablkcipher_cleanup(req);
+               mv_cesa_skcipher_cleanup(req);
 
        return ret;
 }
 
-static int mv_cesa_des_op(struct ablkcipher_request *req,
+static int mv_cesa_des_op(struct skcipher_request *req,
                          struct mv_cesa_op_ctx *tmpl)
 {
        struct mv_cesa_des_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
@@ -479,10 +487,10 @@ static int mv_cesa_des_op(struct ablkcipher_request *req,
 
        memcpy(tmpl->ctx.blkcipher.key, ctx->key, DES_KEY_SIZE);
 
-       return mv_cesa_ablkcipher_queue_req(req, tmpl);
+       return mv_cesa_skcipher_queue_req(req, tmpl);
 }
 
-static int mv_cesa_ecb_des_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_des_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -493,7 +501,7 @@ static int mv_cesa_ecb_des_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_des_op(req, &tmpl);
 }
 
-static int mv_cesa_ecb_des_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_des_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -504,41 +512,38 @@ static int mv_cesa_ecb_des_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_des_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_ecb_des_alg = {
-       .cra_name = "ecb(des)",
-       .cra_driver_name = "mv-ecb-des",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = DES_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = DES_KEY_SIZE,
-                       .max_keysize = DES_KEY_SIZE,
-                       .setkey = mv_cesa_des_setkey,
-                       .encrypt = mv_cesa_ecb_des_encrypt,
-                       .decrypt = mv_cesa_ecb_des_decrypt,
-               },
+struct skcipher_alg mv_cesa_ecb_des_alg = {
+       .setkey = mv_cesa_des_setkey,
+       .encrypt = mv_cesa_ecb_des_encrypt,
+       .decrypt = mv_cesa_ecb_des_decrypt,
+       .min_keysize = DES_KEY_SIZE,
+       .max_keysize = DES_KEY_SIZE,
+       .base = {
+               .cra_name = "ecb(des)",
+               .cra_driver_name = "mv-ecb-des",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = DES_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
 
-static int mv_cesa_cbc_des_op(struct ablkcipher_request *req,
+static int mv_cesa_cbc_des_op(struct skcipher_request *req,
                              struct mv_cesa_op_ctx *tmpl)
 {
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTCM_CBC,
                              CESA_SA_DESC_CFG_CRYPTCM_MSK);
 
-       memcpy(tmpl->ctx.blkcipher.iv, req->info, DES_BLOCK_SIZE);
+       memcpy(tmpl->ctx.blkcipher.iv, req->iv, DES_BLOCK_SIZE);
 
        return mv_cesa_des_op(req, tmpl);
 }
 
-static int mv_cesa_cbc_des_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_des_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -547,7 +552,7 @@ static int mv_cesa_cbc_des_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_des_op(req, &tmpl);
 }
 
-static int mv_cesa_cbc_des_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_des_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -556,31 +561,28 @@ static int mv_cesa_cbc_des_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_des_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_cbc_des_alg = {
-       .cra_name = "cbc(des)",
-       .cra_driver_name = "mv-cbc-des",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = DES_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = DES_KEY_SIZE,
-                       .max_keysize = DES_KEY_SIZE,
-                       .ivsize      = DES_BLOCK_SIZE,
-                       .setkey = mv_cesa_des_setkey,
-                       .encrypt = mv_cesa_cbc_des_encrypt,
-                       .decrypt = mv_cesa_cbc_des_decrypt,
-               },
+struct skcipher_alg mv_cesa_cbc_des_alg = {
+       .setkey = mv_cesa_des_setkey,
+       .encrypt = mv_cesa_cbc_des_encrypt,
+       .decrypt = mv_cesa_cbc_des_decrypt,
+       .min_keysize = DES_KEY_SIZE,
+       .max_keysize = DES_KEY_SIZE,
+       .ivsize = DES_BLOCK_SIZE,
+       .base = {
+               .cra_name = "cbc(des)",
+               .cra_driver_name = "mv-cbc-des",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = DES_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_des_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
 
-static int mv_cesa_des3_op(struct ablkcipher_request *req,
+static int mv_cesa_des3_op(struct skcipher_request *req,
                           struct mv_cesa_op_ctx *tmpl)
 {
        struct mv_cesa_des3_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
@@ -590,10 +592,10 @@ static int mv_cesa_des3_op(struct ablkcipher_request *req,
 
        memcpy(tmpl->ctx.blkcipher.key, ctx->key, DES3_EDE_KEY_SIZE);
 
-       return mv_cesa_ablkcipher_queue_req(req, tmpl);
+       return mv_cesa_skcipher_queue_req(req, tmpl);
 }
 
-static int mv_cesa_ecb_des3_ede_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_des3_ede_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -605,7 +607,7 @@ static int mv_cesa_ecb_des3_ede_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_des3_op(req, &tmpl);
 }
 
-static int mv_cesa_ecb_des3_ede_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_des3_ede_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -617,39 +619,36 @@ static int mv_cesa_ecb_des3_ede_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_des3_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_ecb_des3_ede_alg = {
-       .cra_name = "ecb(des3_ede)",
-       .cra_driver_name = "mv-ecb-des3-ede",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = DES3_EDE_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_des3_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = DES3_EDE_KEY_SIZE,
-                       .max_keysize = DES3_EDE_KEY_SIZE,
-                       .ivsize      = DES3_EDE_BLOCK_SIZE,
-                       .setkey = mv_cesa_des3_ede_setkey,
-                       .encrypt = mv_cesa_ecb_des3_ede_encrypt,
-                       .decrypt = mv_cesa_ecb_des3_ede_decrypt,
-               },
+struct skcipher_alg mv_cesa_ecb_des3_ede_alg = {
+       .setkey = mv_cesa_des3_ede_setkey,
+       .encrypt = mv_cesa_ecb_des3_ede_encrypt,
+       .decrypt = mv_cesa_ecb_des3_ede_decrypt,
+       .min_keysize = DES3_EDE_KEY_SIZE,
+       .max_keysize = DES3_EDE_KEY_SIZE,
+       .ivsize = DES3_EDE_BLOCK_SIZE,
+       .base = {
+               .cra_name = "ecb(des3_ede)",
+               .cra_driver_name = "mv-ecb-des3-ede",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_des3_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
 
-static int mv_cesa_cbc_des3_op(struct ablkcipher_request *req,
+static int mv_cesa_cbc_des3_op(struct skcipher_request *req,
                               struct mv_cesa_op_ctx *tmpl)
 {
-       memcpy(tmpl->ctx.blkcipher.iv, req->info, DES3_EDE_BLOCK_SIZE);
+       memcpy(tmpl->ctx.blkcipher.iv, req->iv, DES3_EDE_BLOCK_SIZE);
 
        return mv_cesa_des3_op(req, tmpl);
 }
 
-static int mv_cesa_cbc_des3_ede_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_des3_ede_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -661,7 +660,7 @@ static int mv_cesa_cbc_des3_ede_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_des3_op(req, &tmpl);
 }
 
-static int mv_cesa_cbc_des3_ede_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_des3_ede_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -673,31 +672,28 @@ static int mv_cesa_cbc_des3_ede_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_des3_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_cbc_des3_ede_alg = {
-       .cra_name = "cbc(des3_ede)",
-       .cra_driver_name = "mv-cbc-des3-ede",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = DES3_EDE_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_des3_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = DES3_EDE_KEY_SIZE,
-                       .max_keysize = DES3_EDE_KEY_SIZE,
-                       .ivsize      = DES3_EDE_BLOCK_SIZE,
-                       .setkey = mv_cesa_des3_ede_setkey,
-                       .encrypt = mv_cesa_cbc_des3_ede_encrypt,
-                       .decrypt = mv_cesa_cbc_des3_ede_decrypt,
-               },
+struct skcipher_alg mv_cesa_cbc_des3_ede_alg = {
+       .setkey = mv_cesa_des3_ede_setkey,
+       .encrypt = mv_cesa_cbc_des3_ede_encrypt,
+       .decrypt = mv_cesa_cbc_des3_ede_decrypt,
+       .min_keysize = DES3_EDE_KEY_SIZE,
+       .max_keysize = DES3_EDE_KEY_SIZE,
+       .ivsize = DES3_EDE_BLOCK_SIZE,
+       .base = {
+               .cra_name = "cbc(des3_ede)",
+               .cra_driver_name = "mv-cbc-des3-ede",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = DES3_EDE_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_des3_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
 
-static int mv_cesa_aes_op(struct ablkcipher_request *req,
+static int mv_cesa_aes_op(struct skcipher_request *req,
                          struct mv_cesa_op_ctx *tmpl)
 {
        struct mv_cesa_aes_ctx *ctx = crypto_tfm_ctx(req->base.tfm);
@@ -724,10 +720,10 @@ static int mv_cesa_aes_op(struct ablkcipher_request *req,
                              CESA_SA_DESC_CFG_CRYPTM_MSK |
                              CESA_SA_DESC_CFG_AES_LEN_MSK);
 
-       return mv_cesa_ablkcipher_queue_req(req, tmpl);
+       return mv_cesa_skcipher_queue_req(req, tmpl);
 }
 
-static int mv_cesa_ecb_aes_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_aes_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -738,7 +734,7 @@ static int mv_cesa_ecb_aes_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_aes_op(req, &tmpl);
 }
 
-static int mv_cesa_ecb_aes_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_ecb_aes_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -749,40 +745,37 @@ static int mv_cesa_ecb_aes_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_aes_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_ecb_aes_alg = {
-       .cra_name = "ecb(aes)",
-       .cra_driver_name = "mv-ecb-aes",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = AES_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_aes_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = AES_MIN_KEY_SIZE,
-                       .max_keysize = AES_MAX_KEY_SIZE,
-                       .setkey = mv_cesa_aes_setkey,
-                       .encrypt = mv_cesa_ecb_aes_encrypt,
-                       .decrypt = mv_cesa_ecb_aes_decrypt,
-               },
+struct skcipher_alg mv_cesa_ecb_aes_alg = {
+       .setkey = mv_cesa_aes_setkey,
+       .encrypt = mv_cesa_ecb_aes_encrypt,
+       .decrypt = mv_cesa_ecb_aes_decrypt,
+       .min_keysize = AES_MIN_KEY_SIZE,
+       .max_keysize = AES_MAX_KEY_SIZE,
+       .base = {
+               .cra_name = "ecb(aes)",
+               .cra_driver_name = "mv-ecb-aes",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = AES_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_aes_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
 
-static int mv_cesa_cbc_aes_op(struct ablkcipher_request *req,
+static int mv_cesa_cbc_aes_op(struct skcipher_request *req,
                              struct mv_cesa_op_ctx *tmpl)
 {
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTCM_CBC,
                              CESA_SA_DESC_CFG_CRYPTCM_MSK);
-       memcpy(tmpl->ctx.blkcipher.iv, req->info, AES_BLOCK_SIZE);
+       memcpy(tmpl->ctx.blkcipher.iv, req->iv, AES_BLOCK_SIZE);
 
        return mv_cesa_aes_op(req, tmpl);
 }
 
-static int mv_cesa_cbc_aes_encrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_aes_encrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -791,7 +784,7 @@ static int mv_cesa_cbc_aes_encrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_aes_op(req, &tmpl);
 }
 
-static int mv_cesa_cbc_aes_decrypt(struct ablkcipher_request *req)
+static int mv_cesa_cbc_aes_decrypt(struct skcipher_request *req)
 {
        struct mv_cesa_op_ctx tmpl;
 
@@ -800,26 +793,23 @@ static int mv_cesa_cbc_aes_decrypt(struct 
ablkcipher_request *req)
        return mv_cesa_cbc_aes_op(req, &tmpl);
 }
 
-struct crypto_alg mv_cesa_cbc_aes_alg = {
-       .cra_name = "cbc(aes)",
-       .cra_driver_name = "mv-cbc-aes",
-       .cra_priority = 300,
-       .cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER |
-                    CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
-       .cra_blocksize = AES_BLOCK_SIZE,
-       .cra_ctxsize = sizeof(struct mv_cesa_aes_ctx),
-       .cra_alignmask = 0,
-       .cra_type = &crypto_ablkcipher_type,
-       .cra_module = THIS_MODULE,
-       .cra_init = mv_cesa_ablkcipher_cra_init,
-       .cra_u = {
-               .ablkcipher = {
-                       .min_keysize = AES_MIN_KEY_SIZE,
-                       .max_keysize = AES_MAX_KEY_SIZE,
-                       .ivsize = AES_BLOCK_SIZE,
-                       .setkey = mv_cesa_aes_setkey,
-                       .encrypt = mv_cesa_cbc_aes_encrypt,
-                       .decrypt = mv_cesa_cbc_aes_decrypt,
-               },
+struct skcipher_alg mv_cesa_cbc_aes_alg = {
+       .setkey = mv_cesa_aes_setkey,
+       .encrypt = mv_cesa_cbc_aes_encrypt,
+       .decrypt = mv_cesa_cbc_aes_decrypt,
+       .min_keysize = AES_MIN_KEY_SIZE,
+       .max_keysize = AES_MAX_KEY_SIZE,
+       .ivsize = AES_BLOCK_SIZE,
+       .base = {
+               .cra_name = "cbc(aes)",
+               .cra_driver_name = "mv-cbc-aes",
+               .cra_priority = 300,
+               .cra_flags = CRYPTO_ALG_KERN_DRIVER_ONLY | CRYPTO_ALG_ASYNC,
+               .cra_blocksize = AES_BLOCK_SIZE,
+               .cra_ctxsize = sizeof(struct mv_cesa_aes_ctx),
+               .cra_alignmask = 0,
+               .cra_module = THIS_MODULE,
+               .cra_init = mv_cesa_skcipher_cra_init,
+               .cra_exit = mv_cesa_skcipher_cra_exit,
        },
 };
-- 
2.11.0

Reply via email to