From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
Eric Biggers <ebiggers@google.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 26/27] crypto: marvell/cesa - rename blkcipher to skcipher
Date: Thu, 24 Oct 2019 15:23:44 +0200 [thread overview]
Message-ID: <20191024132345.5236-27-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20191024132345.5236-1-ard.biesheuvel@linaro.org>
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 <ard.biesheuvel@linaro.org>
---
drivers/crypto/marvell/cesa.h | 6 +++---
drivers/crypto/marvell/cipher.c | 14 +++++++-------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/crypto/marvell/cesa.h b/drivers/crypto/marvell/cesa.h
index d63a6ee905c9..f1ed3b85c0d2 100644
--- 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 84ceddfee76b..d8e8c857770c 100644
--- 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);
}
--
2.20.1
next prev parent reply other threads:[~2019-10-24 13:24 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-24 13:23 [PATCH v2 00/27] crypto: convert h/w accelerator drivers to skcipher API Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 01/27] crypto: virtio - implement missing support for output IVs Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 02/27] crypto: virtio - deal with unsupported input sizes Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 03/27] crypto: virtio - switch to skcipher API Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 04/27] crypto: ccp - switch from ablkcipher to skcipher Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 05/27] crypto: omap - switch to skcipher API Ard Biesheuvel
2019-10-24 13:41 ` Tony Lindgren
2019-10-24 13:42 ` Ard Biesheuvel
2019-10-25 7:32 ` Tero Kristo
2019-10-25 10:19 ` Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 06/27] crypto: ux500 " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 07/27] crypto: s5p " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 08/27] crypto: atmel-aes " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 09/27] crypto: atmel-tdes " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 10/27] crypto: bcm-spu " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 11/27] crypto: nitrox - remove cra_type reference to ablkcipher Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 12/27] crypto: cavium/cpt - switch to skcipher API Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 13/27] crypto: chelsio " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 14/27] crypto: hifn " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 15/27] crypto: ixp4xx " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 16/27] crypto: mxs " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 17/27] crypto: mediatek " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 18/27] crypto: sahara " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 19/27] crypto: picoxcell " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 20/27] crypto: qce " Ard Biesheuvel
2019-10-27 9:51 ` Stanimir Varbanov
2019-10-24 13:23 ` [PATCH v2 21/27] crypto: stm32 " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 22/27] crypto: niagara2 " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 23/27] crypto: rockchip " Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 24/27] crypto: talitos " Ard Biesheuvel
2019-10-27 10:45 ` Christophe Leroy
2019-10-27 11:05 ` Ard Biesheuvel
2019-10-27 13:05 ` Christophe Leroy
2019-10-28 6:20 ` Ard Biesheuvel
2019-10-28 10:36 ` Christophe Leroy
2019-10-28 10:39 ` Ard Biesheuvel
2019-10-24 13:23 ` [PATCH v2 25/27] crypto: qat " Ard Biesheuvel
2019-10-24 13:23 ` Ard Biesheuvel [this message]
2019-10-24 13:23 ` [PATCH v2 27/27] crypto: nx - remove stale comment referring to the blkcipher walk API Ard Biesheuvel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191024132345.5236-27-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=davem@davemloft.net \
--cc=ebiggers@google.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).