crypto: marvell/cesa - rename blkcipher to skcipher

The driver specific types contain some rudimentary references to the
blkcipher API, which is deprecated and will be removed. To avoid confusion,
rename these to skcipher. This is a cosmetic change only, as the code does
not actually use the blkcipher API.

Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index d63a6ee905c95ebf81fd855788871328acf81df8..f1ed3b85c0d25f85d04d47b243c91d360b166017 100644 (file)
--- a/drivers/crypto/marvell/cesa.h
+++ b/drivers/crypto/marvell/cesa.h
@@ -232,13 +232,13 @@ struct mv_cesa_sec_accel_desc {
 };
 
 /**
- * struct mv_cesa_blkcipher_op_ctx - cipher operation context
+ * struct mv_cesa_skcipher_op_ctx - cipher operation context
  * @key:       cipher key
  * @iv:                cipher IV
  *
  * Context associated to a cipher operation.
  */
-struct mv_cesa_blkcipher_op_ctx {
+struct mv_cesa_skcipher_op_ctx {
        u32 key[8];
        u32 iv[4];
 };
@@ -265,7 +265,7 @@ struct mv_cesa_hash_op_ctx {
 struct mv_cesa_op_ctx {
        struct mv_cesa_sec_accel_desc desc;
        union {
-               struct mv_cesa_blkcipher_op_ctx blkcipher;
+               struct mv_cesa_skcipher_op_ctx skcipher;
                struct mv_cesa_hash_op_ctx hash;
        } ctx;
 };

diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index 84ceddfee76b48e2dcac9d4b0b2c77c3d00123df..d8e8c857770c8dcf69abefb92a4df34d1ab189e1 100644 (file)
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -209,7 +209,7 @@ mv_cesa_skcipher_complete(struct crypto_async_request *req)
                struct mv_cesa_req *basereq;
 
                basereq = &creq->base;
-               memcpy(skreq->iv, basereq->chain.last->op->ctx.blkcipher.iv,
+               memcpy(skreq->iv, basereq->chain.last->op->ctx.skcipher.iv,
                       ivsize);
        } else {
                memcpy_fromio(skreq->iv,
@@ -470,7 +470,7 @@ static int mv_cesa_des_op(struct skcipher_request *req,
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTM_DES,
                              CESA_SA_DESC_CFG_CRYPTM_MSK);
 
-       memcpy(tmpl->ctx.blkcipher.key, ctx->key, DES_KEY_SIZE);
+       memcpy(tmpl->ctx.skcipher.key, ctx->key, DES_KEY_SIZE);
 
        return mv_cesa_skcipher_queue_req(req, tmpl);
 }
@@ -523,7 +523,7 @@ static int mv_cesa_cbc_des_op(struct skcipher_request *req,
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTCM_CBC,
                              CESA_SA_DESC_CFG_CRYPTCM_MSK);
 
-       memcpy(tmpl->ctx.blkcipher.iv, req->iv, DES_BLOCK_SIZE);
+       memcpy(tmpl->ctx.skcipher.iv, req->iv, DES_BLOCK_SIZE);
 
        return mv_cesa_des_op(req, tmpl);
 }
@@ -575,7 +575,7 @@ static int mv_cesa_des3_op(struct skcipher_request *req,
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTM_3DES,
                              CESA_SA_DESC_CFG_CRYPTM_MSK);
 
-       memcpy(tmpl->ctx.blkcipher.key, ctx->key, DES3_EDE_KEY_SIZE);
+       memcpy(tmpl->ctx.skcipher.key, ctx->key, DES3_EDE_KEY_SIZE);
 
        return mv_cesa_skcipher_queue_req(req, tmpl);
 }
@@ -628,7 +628,7 @@ struct skcipher_alg mv_cesa_ecb_des3_ede_alg = {
 static int mv_cesa_cbc_des3_op(struct skcipher_request *req,
                               struct mv_cesa_op_ctx *tmpl)
 {
-       memcpy(tmpl->ctx.blkcipher.iv, req->iv, DES3_EDE_BLOCK_SIZE);
+       memcpy(tmpl->ctx.skcipher.iv, req->iv, DES3_EDE_BLOCK_SIZE);
 
        return mv_cesa_des3_op(req, tmpl);
 }
@@ -694,7 +694,7 @@ static int mv_cesa_aes_op(struct skcipher_request *req,
                key = ctx->aes.key_enc;
 
        for (i = 0; i < ctx->aes.key_length / sizeof(u32); i++)
-               tmpl->ctx.blkcipher.key[i] = cpu_to_le32(key[i]);
+               tmpl->ctx.skcipher.key[i] = cpu_to_le32(key[i]);
 
        if (ctx->aes.key_length == 24)
                cfg |= CESA_SA_DESC_CFG_AES_LEN_192;
@@ -755,7 +755,7 @@ static int mv_cesa_cbc_aes_op(struct skcipher_request *req,
 {
        mv_cesa_update_op_cfg(tmpl, CESA_SA_DESC_CFG_CRYPTCM_CBC,
                              CESA_SA_DESC_CFG_CRYPTCM_MSK);
-       memcpy(tmpl->ctx.blkcipher.iv, req->iv, AES_BLOCK_SIZE);
+       memcpy(tmpl->ctx.skcipher.iv, req->iv, AES_BLOCK_SIZE);
 
        return mv_cesa_aes_op(req, tmpl);
 }