Commit a9b0838d authored by Taehee Yoo's avatar Taehee Yoo Committed by Herbert Xu
Browse files

crypto: aria - prepare generic module for optimized implementations 



It renames aria to aria_generic and exports some functions such as
aria_set_key(), aria_encrypt(), and aria_decrypt() to be able to be
used by aria-avx implementation.

Signed-off-by: default avatarTaehee Yoo <ap420073@gmail.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 4532f1cf

crypto/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ obj-$(CONFIG_CRYPTO_TEA) += tea.o 
obj-$(CONFIG_CRYPTO_KHAZAD) += khazad.o

obj-$(CONFIG_CRYPTO_KHAZAD) += khazad.o

obj-$(CONFIG_CRYPTO_ANUBIS) += anubis.o

obj-$(CONFIG_CRYPTO_ANUBIS) += anubis.o

obj-$(CONFIG_CRYPTO_SEED) += seed.o

obj-$(CONFIG_CRYPTO_SEED) += seed.o

obj-$(CONFIG_CRYPTO_ARIA) += aria.o

obj-$(CONFIG_CRYPTO_ARIA) += aria_generic.o

obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o

obj-$(CONFIG_CRYPTO_CHACHA20) += chacha_generic.o

obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o

obj-$(CONFIG_CRYPTO_POLY1305) += poly1305_generic.o

obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o

obj-$(CONFIG_CRYPTO_DEFLATE) += deflate.o

crypto/aria.c→crypto/aria_generic.c

+32 −7
Original line number Original line Diff line number Diff line
@@ -16,6 +16,14 @@ 




#include <crypto/aria.h>

#include <crypto/aria.h>





static const u32 key_rc[20] = {

	0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0,

	0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0,

	0xdb92371d, 0x2126e970, 0x03249775, 0x04e8c90e,

	0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0,

	0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0

};



static void aria_set_encrypt_key(struct aria_ctx *ctx, const u8 *in_key,

static void aria_set_encrypt_key(struct aria_ctx *ctx, const u8 *in_key,

				 unsigned int key_len)

				 unsigned int key_len)

{

{
@@ -25,7 +33,7 @@ static void aria_set_encrypt_key(struct aria_ctx *ctx, const u8 *in_key, 
	const u32 *ck;

	const u32 *ck;

	int rkidx = 0;

	int rkidx = 0;





	ck = &key_rc[(key_len - 16) / 8][0];

	ck = &key_rc[(key_len - 16) / 2];





	w0[0] = be32_to_cpu(key[0]);

	w0[0] = be32_to_cpu(key[0]);

	w0[1] = be32_to_cpu(key[1]);

	w0[1] = be32_to_cpu(key[1]);
@@ -163,8 +171,7 @@ static void aria_set_decrypt_key(struct aria_ctx *ctx) 
	}

	}

}

}





static int aria_set_key(struct crypto_tfm *tfm, const u8 *in_key,

int aria_set_key(struct crypto_tfm *tfm, const u8 *in_key, unsigned int key_len)

			unsigned int key_len)

{

{

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -179,6 +186,7 @@ static int aria_set_key(struct crypto_tfm *tfm, const u8 *in_key, 




	return 0;

	return 0;

}

}

EXPORT_SYMBOL_GPL(aria_set_key);





static void __aria_crypt(struct aria_ctx *ctx, u8 *out, const u8 *in,

static void __aria_crypt(struct aria_ctx *ctx, u8 *out, const u8 *in,

			 u32 key[][ARIA_RD_KEY_WORDS])

			 u32 key[][ARIA_RD_KEY_WORDS])
@@ -235,14 +243,30 @@ static void __aria_crypt(struct aria_ctx *ctx, u8 *out, const u8 *in, 
	dst[3] = cpu_to_be32(reg3);

	dst[3] = cpu_to_be32(reg3);

}

}





static void aria_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

void aria_encrypt(void *_ctx, u8 *out, const u8 *in)

{

	struct aria_ctx *ctx = (struct aria_ctx *)_ctx;



	__aria_crypt(ctx, out, in, ctx->enc_key);

}

EXPORT_SYMBOL_GPL(aria_encrypt);



void aria_decrypt(void *_ctx, u8 *out, const u8 *in)

{

	struct aria_ctx *ctx = (struct aria_ctx *)_ctx;



	__aria_crypt(ctx, out, in, ctx->dec_key);

}

EXPORT_SYMBOL_GPL(aria_decrypt);



static void __aria_encrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

{

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);





	__aria_crypt(ctx, out, in, ctx->enc_key);

	__aria_crypt(ctx, out, in, ctx->enc_key);

}

}





static void aria_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

static void __aria_decrypt(struct crypto_tfm *tfm, u8 *out, const u8 *in)

{

{

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);

	struct aria_ctx *ctx = crypto_tfm_ctx(tfm);
@@ -263,8 +287,8 @@ static struct crypto_alg aria_alg = { 
			.cia_min_keysize	=	ARIA_MIN_KEY_SIZE,

			.cia_min_keysize	=	ARIA_MIN_KEY_SIZE,

			.cia_max_keysize	=	ARIA_MAX_KEY_SIZE,

			.cia_max_keysize	=	ARIA_MAX_KEY_SIZE,

			.cia_setkey		=	aria_set_key,

			.cia_setkey		=	aria_set_key,

			.cia_encrypt		=	aria_encrypt,

			.cia_encrypt		=	__aria_encrypt,

			.cia_decrypt		=	aria_decrypt

			.cia_decrypt		=	__aria_decrypt

		}

		}

	}

	}

};

};
@@ -286,3 +310,4 @@ MODULE_DESCRIPTION("ARIA Cipher Algorithm"); 
MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_AUTHOR("Taehee Yoo <ap420073@gmail.com>");

MODULE_AUTHOR("Taehee Yoo <ap420073@gmail.com>");

MODULE_ALIAS_CRYPTO("aria");

MODULE_ALIAS_CRYPTO("aria");

MODULE_ALIAS_CRYPTO("aria-generic");

include/crypto/aria.h

+7 −10
Original line number Original line Diff line number Diff line
@@ -32,18 +32,10 @@ 
#define ARIA_RD_KEY_WORDS	(ARIA_BLOCK_SIZE / sizeof(u32))

#define ARIA_RD_KEY_WORDS	(ARIA_BLOCK_SIZE / sizeof(u32))





struct aria_ctx {

struct aria_ctx {

	int key_length;

	int rounds;

	u32 enc_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];

	u32 enc_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];

	u32 dec_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];

	u32 dec_key[ARIA_MAX_RD_KEYS][ARIA_RD_KEY_WORDS];

};

	int rounds;



	int key_length;

static const u32 key_rc[5][4] = {

	{ 0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0 },

	{ 0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0 },

	{ 0xdb92371d, 0x2126e970, 0x03249775, 0x04e8c90e },

	{ 0x517cc1b7, 0x27220a94, 0xfe13abe8, 0xfa9a6ee0 },

	{ 0x6db14acc, 0x9e21c820, 0xff28b1d5, 0xef5de2b0 }

};

};





static const u32 s1[256] = {

static const u32 s1[256] = {
@@ -458,4 +450,9 @@ static inline void aria_gsrk(u32 *rk, u32 *x, u32 *y, u32 n) 
		((y[(q + 2) % 4]) << (32 - r));

		((y[(q + 2) % 4]) << (32 - r));

}

}





void aria_encrypt(void *ctx, u8 *out, const u8 *in);

void aria_decrypt(void *ctx, u8 *out, const u8 *in);

int aria_set_key(struct crypto_tfm *tfm, const u8 *in_key,

		 unsigned int key_len);



#endif
 
#endif