public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-04-13 09:59:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

crypto: arc4 - Convert from skcipher to lskcipher

Browse source 
Replace skcipher implementation with lskcipher.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Herbert Xu 2023-10-03 11:43:18 +08:00
parent 845346841b
commit 9a91792db1
2 changed files with 24 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
crypto/arc4.c
View file

@ -7,7 +7,6 @@
* Jon Oberheide <jon@oberheide.org> * Jon Oberheide <jon@oberheide.org>
*/ */
#include <crypto/algapi.h>
#include <crypto/arc4.h> #include <crypto/arc4.h>
#include <crypto/internal/skcipher.h> #include <crypto/internal/skcipher.h>
#include <linux/init.h> #include <linux/init.h>
@ -15,33 +14,24 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/sched.h> #include <linux/sched.h>
static int crypto_arc4_setkey(struct crypto_skcipher *tfm, const u8 *in_key, static int crypto_arc4_setkey(struct crypto_lskcipher *tfm, const u8 *in_key,
unsigned int key_len) unsigned int key_len)
{ {
struct arc4_ctx *ctx = crypto_skcipher_ctx(tfm); struct arc4_ctx *ctx = crypto_lskcipher_ctx(tfm);
return arc4_setkey(ctx, in_key, key_len); return arc4_setkey(ctx, in_key, key_len);
} }
static int crypto_arc4_crypt(struct skcipher_request *req) static int crypto_arc4_crypt(struct crypto_lskcipher *tfm, const u8 *src,
u8 *dst, unsigned nbytes, u8 *iv, bool final)
{ {
struct crypto_skcipher *tfm = crypto_skcipher_reqtfm(req); struct arc4_ctx *ctx = crypto_lskcipher_ctx(tfm);
struct arc4_ctx *ctx = crypto_skcipher_ctx(tfm);
struct skcipher_walk walk;
int err;
err = skcipher_walk_virt(&walk, req, false); arc4_crypt(ctx, dst, src, nbytes);
return 0;
while (walk.nbytes > 0) {
arc4_crypt(ctx, walk.dst.virt.addr, walk.src.virt.addr,
walk.nbytes);
err = skcipher_walk_done(&walk, 0);
}
return err;
} }
static int crypto_arc4_init(struct crypto_skcipher *tfm) static int crypto_arc4_init(struct crypto_lskcipher *tfm)
{ {
pr_warn_ratelimited("\"%s\" (%ld) uses obsolete ecb(arc4) skcipher\n", pr_warn_ratelimited("\"%s\" (%ld) uses obsolete ecb(arc4) skcipher\n",
current->comm, (unsigned long)current->pid); current->comm, (unsigned long)current->pid);
@ -49,33 +39,29 @@ static int crypto_arc4_init(struct crypto_skcipher *tfm)
return 0; return 0;
} }
static struct skcipher_alg arc4_alg = { static struct lskcipher_alg arc4_alg = {
/* .co.base.cra_name = "arc4",
* For legacy reasons, this is named "ecb(arc4)", not "arc4". .co.base.cra_driver_name = "arc4-generic",
* Nevertheless it's actually a stream cipher, not a block cipher. .co.base.cra_priority = 100,
*/ .co.base.cra_blocksize = ARC4_BLOCK_SIZE,
.base.cra_name = "ecb(arc4)", .co.base.cra_ctxsize = sizeof(struct arc4_ctx),
.base.cra_driver_name = "ecb(arc4)-generic", .co.base.cra_module = THIS_MODULE,
.base.cra_priority = 100, .co.min_keysize = ARC4_MIN_KEY_SIZE,
.base.cra_blocksize = ARC4_BLOCK_SIZE, .co.max_keysize = ARC4_MAX_KEY_SIZE,
.base.cra_ctxsize = sizeof(struct arc4_ctx), .setkey = crypto_arc4_setkey,
.base.cra_module = THIS_MODULE, .encrypt = crypto_arc4_crypt,
.min_keysize = ARC4_MIN_KEY_SIZE, .decrypt = crypto_arc4_crypt,
.max_keysize = ARC4_MAX_KEY_SIZE, .init = crypto_arc4_init,
.setkey = crypto_arc4_setkey,
.encrypt = crypto_arc4_crypt,
.decrypt = crypto_arc4_crypt,
.init = crypto_arc4_init,
}; };
static int __init arc4_init(void) static int __init arc4_init(void)
{ {
return crypto_register_skcipher(&arc4_alg); return crypto_register_lskcipher(&arc4_alg);
} }
static void __exit arc4_exit(void) static void __exit arc4_exit(void)
{ {
crypto_unregister_skcipher(&arc4_alg); crypto_unregister_lskcipher(&arc4_alg);
} }
subsys_initcall(arc4_init); subsys_initcall(arc4_init);

2
crypto/testmgr.c
View file

@ -4963,7 +4963,7 @@ static const struct alg_test_desc alg_test_descs[] = {
} }
}, { }, {
.alg = "ecb(arc4)", .alg = "ecb(arc4)",
.generic_driver = "ecb(arc4)-generic", .generic_driver = "arc4-generic",
.test = alg_test_skcipher, .test = alg_test_skcipher,
.suite = { .suite = {
.cipher = __VECS(arc4_tv_template) .cipher = __VECS(arc4_tv_template)