Commit 9a91792d authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: arc4 - Convert from skcipher to lskcipher 



Replace skcipher implementation with lskcipher.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 84534684

crypto/arc4.c

+23 −37
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
 * Jon Oberheide <jon@oberheide.org>

 */



#include <crypto/algapi.h>

#include <crypto/arc4.h>

#include <crypto/internal/skcipher.h>

#include <linux/init.h>
@@ -15,33 +14,24 @@ 
#include <linux/module.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)

{

	struct arc4_ctx *ctx = crypto_skcipher_ctx(tfm);

	struct arc4_ctx *ctx = crypto_lskcipher_ctx(tfm);



	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_skcipher_ctx(tfm);

	struct skcipher_walk walk;

	int err;

	struct arc4_ctx *ctx = crypto_lskcipher_ctx(tfm);



	err = skcipher_walk_virt(&walk, req, false);



	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;

	arc4_crypt(ctx, dst, src, nbytes);

	return 0;

}



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",

			    current->comm, (unsigned long)current->pid);
@@ -49,19 +39,15 @@ static int crypto_arc4_init(struct crypto_skcipher *tfm) 
	return 0;

}



static struct skcipher_alg arc4_alg = {

	/*

	 * For legacy reasons, this is named "ecb(arc4)", not "arc4".

	 * Nevertheless it's actually a stream cipher, not a block cipher.

	 */

	.base.cra_name		=	"ecb(arc4)",

	.base.cra_driver_name	=	"ecb(arc4)-generic",

	.base.cra_priority	=	100,

	.base.cra_blocksize	=	ARC4_BLOCK_SIZE,

	.base.cra_ctxsize	=	sizeof(struct arc4_ctx),

	.base.cra_module	=	THIS_MODULE,

	.min_keysize		=	ARC4_MIN_KEY_SIZE,

	.max_keysize		=	ARC4_MAX_KEY_SIZE,

static struct lskcipher_alg arc4_alg = {

	.co.base.cra_name		=	"arc4",

	.co.base.cra_driver_name	=	"arc4-generic",

	.co.base.cra_priority		=	100,

	.co.base.cra_blocksize		=	ARC4_BLOCK_SIZE,

	.co.base.cra_ctxsize		=	sizeof(struct arc4_ctx),

	.co.base.cra_module		=	THIS_MODULE,

	.co.min_keysize			=	ARC4_MIN_KEY_SIZE,

	.co.max_keysize			=	ARC4_MAX_KEY_SIZE,

	.setkey				=	crypto_arc4_setkey,

	.encrypt			=	crypto_arc4_crypt,

	.decrypt			=	crypto_arc4_crypt,
@@ -70,12 +56,12 @@ static struct skcipher_alg arc4_alg = { 


static int __init arc4_init(void)

{

	return crypto_register_skcipher(&arc4_alg);

	return crypto_register_lskcipher(&arc4_alg);

}



static void __exit arc4_exit(void)

{

	crypto_unregister_skcipher(&arc4_alg);

	crypto_unregister_lskcipher(&arc4_alg);

}



subsys_initcall(arc4_init);

crypto/testmgr.c

+1 −1
Original line number Diff line number Diff line
@@ -4963,7 +4963,7 @@ static const struct alg_test_desc alg_test_descs[] = { 
		}

	}, {

		.alg = "ecb(arc4)",

		.generic_driver = "ecb(arc4)-generic",

		.generic_driver = "arc4-generic",

		.test = alg_test_skcipher,

		.suite = {

			.cipher = __VECS(arc4_tv_template)