mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
120 lines
3.9 KiB
Diff
120 lines
3.9 KiB
Diff
From d6996995f04ac2be833d87b94e78aa532ed9ee16 Mon Sep 17 00:00:00 2001
|
|
From: Corentin Labbe <clabbe@baylibre.com>
|
|
Date: Tue, 27 Sep 2022 07:54:58 +0000
|
|
Subject: [PATCH 36/49] crypto: rockchip: rename ablk functions to cipher
|
|
|
|
Some functions have still ablk in their name even if there are
|
|
not handling ablk_cipher anymore.
|
|
So let's rename them.
|
|
|
|
Reviewed-by: John Keeping <john@metanate.com>
|
|
Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
|
|
---
|
|
.../crypto/rockchip/rk3288_crypto_skcipher.c | 32 +++++++++----------
|
|
1 file changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
|
|
+++ b/drivers/crypto/rockchip/rk3288_crypto_skcipher.c
|
|
@@ -273,7 +273,7 @@ static int rk_des3_ede_cbc_decrypt(struc
|
|
return rk_handle_req(dev, req);
|
|
}
|
|
|
|
-static void rk_ablk_hw_init(struct rk_crypto_info *dev, struct skcipher_request *req)
|
|
+static void rk_cipher_hw_init(struct rk_crypto_info *dev, struct skcipher_request *req)
|
|
{
|
|
struct crypto_skcipher *cipher = crypto_skcipher_reqtfm(req);
|
|
struct crypto_tfm *tfm = crypto_skcipher_tfm(cipher);
|
|
@@ -382,7 +382,7 @@ static int rk_cipher_run(struct crypto_e
|
|
}
|
|
}
|
|
err = 0;
|
|
- rk_ablk_hw_init(ctx->dev, areq);
|
|
+ rk_cipher_hw_init(ctx->dev, areq);
|
|
if (ivsize) {
|
|
if (ivsize == DES_BLOCK_SIZE)
|
|
memcpy_toio(ctx->dev->reg + RK_CRYPTO_TDES_IV_0, ivtouse, ivsize);
|
|
@@ -448,7 +448,7 @@ theend_iv:
|
|
return err;
|
|
}
|
|
|
|
-static int rk_ablk_init_tfm(struct crypto_skcipher *tfm)
|
|
+static int rk_cipher_tfm_init(struct crypto_skcipher *tfm)
|
|
{
|
|
struct rk_cipher_ctx *ctx = crypto_skcipher_ctx(tfm);
|
|
struct skcipher_alg *alg = crypto_skcipher_alg(tfm);
|
|
@@ -482,7 +482,7 @@ error_pm:
|
|
return err;
|
|
}
|
|
|
|
-static void rk_ablk_exit_tfm(struct crypto_skcipher *tfm)
|
|
+static void rk_cipher_tfm_exit(struct crypto_skcipher *tfm)
|
|
{
|
|
struct rk_cipher_ctx *ctx = crypto_skcipher_ctx(tfm);
|
|
|
|
@@ -503,8 +503,8 @@ struct rk_crypto_tmp rk_ecb_aes_alg = {
|
|
.base.cra_alignmask = 0x0f,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = AES_MIN_KEY_SIZE,
|
|
.max_keysize = AES_MAX_KEY_SIZE,
|
|
.setkey = rk_aes_setkey,
|
|
@@ -525,8 +525,8 @@ struct rk_crypto_tmp rk_cbc_aes_alg = {
|
|
.base.cra_alignmask = 0x0f,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = AES_MIN_KEY_SIZE,
|
|
.max_keysize = AES_MAX_KEY_SIZE,
|
|
.ivsize = AES_BLOCK_SIZE,
|
|
@@ -548,8 +548,8 @@ struct rk_crypto_tmp rk_ecb_des_alg = {
|
|
.base.cra_alignmask = 0x07,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = DES_KEY_SIZE,
|
|
.max_keysize = DES_KEY_SIZE,
|
|
.setkey = rk_des_setkey,
|
|
@@ -570,8 +570,8 @@ struct rk_crypto_tmp rk_cbc_des_alg = {
|
|
.base.cra_alignmask = 0x07,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = DES_KEY_SIZE,
|
|
.max_keysize = DES_KEY_SIZE,
|
|
.ivsize = DES_BLOCK_SIZE,
|
|
@@ -593,8 +593,8 @@ struct rk_crypto_tmp rk_ecb_des3_ede_alg
|
|
.base.cra_alignmask = 0x07,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = DES3_EDE_KEY_SIZE,
|
|
.max_keysize = DES3_EDE_KEY_SIZE,
|
|
.setkey = rk_tdes_setkey,
|
|
@@ -615,8 +615,8 @@ struct rk_crypto_tmp rk_cbc_des3_ede_alg
|
|
.base.cra_alignmask = 0x07,
|
|
.base.cra_module = THIS_MODULE,
|
|
|
|
- .init = rk_ablk_init_tfm,
|
|
- .exit = rk_ablk_exit_tfm,
|
|
+ .init = rk_cipher_tfm_init,
|
|
+ .exit = rk_cipher_tfm_exit,
|
|
.min_keysize = DES3_EDE_KEY_SIZE,
|
|
.max_keysize = DES3_EDE_KEY_SIZE,
|
|
.ivsize = DES_BLOCK_SIZE,
|