Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f2a5d2d authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: blowfish - rename C-version to blowfish_generic 



Rename blowfish to blowfish_generic so that assembler versions of blowfish
cipher can autoload. Module alias 'blowfish' is added.

Also fix checkpatch warnings.

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 52ba867c

crypto/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ obj-$(CONFIG_CRYPTO_PCRYPT) += pcrypt.o 
obj-$(CONFIG_CRYPTO_CRYPTD) += cryptd.o

obj-$(CONFIG_CRYPTO_DES) += des_generic.o

obj-$(CONFIG_CRYPTO_FCRYPT) += fcrypt.o

obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish.o

obj-$(CONFIG_CRYPTO_BLOWFISH) += blowfish_generic.o

obj-$(CONFIG_CRYPTO_BLOWFISH_COMMON) += blowfish_common.o

obj-$(CONFIG_CRYPTO_TWOFISH) += twofish_generic.o

obj-$(CONFIG_CRYPTO_TWOFISH_COMMON) += twofish_common.o

crypto/blowfish.c→crypto/blowfish_generic.c

+7 −4
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#define bf_F(x) (((S[GET32_0(x)] + S[256 + GET32_1(x)]) ^ \

		S[512 + GET32_2(x)]) + S[768 + GET32_3(x)])



#define ROUND(a, b, n)  b ^= P[n]; a ^= bf_F (b)

#define ROUND(a, b, n) ({ b ^= P[n]; a ^= bf_F(b); })



static void bf_encrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)

{
@@ -108,6 +108,8 @@ static void bf_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src) 


static struct crypto_alg alg = {

	.cra_name		=	"blowfish",

	.cra_driver_name	=	"blowfish-generic",

	.cra_priority		=	100,

	.cra_flags		=	CRYPTO_ALG_TYPE_CIPHER,

	.cra_blocksize		=	BF_BLOCK_SIZE,

	.cra_ctxsize		=	sizeof(struct bf_ctx),
@@ -137,3 +139,4 @@ module_exit(blowfish_mod_fini); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Blowfish Cipher Algorithm");

MODULE_ALIAS("blowfish");