Commit 05bd1e2a authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: x86/sm4 - Remove cfb(sm4) 



Remove the unused CFB implementation.

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

arch/x86/crypto/Kconfig

+4 −4
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ config CRYPTO_SERPENT_AVX2_X86_64 
	  Processes 16 blocks in parallel.



config CRYPTO_SM4_AESNI_AVX_X86_64

	tristate "Ciphers: SM4 with modes: ECB, CBC, CFB, CTR (AES-NI/AVX)"

	tristate "Ciphers: SM4 with modes: ECB, CBC, CTR (AES-NI/AVX)"

	depends on X86 && 64BIT

	select CRYPTO_SKCIPHER

	select CRYPTO_SIMD
@@ -197,7 +197,7 @@ config CRYPTO_SM4_AESNI_AVX_X86_64 
	select CRYPTO_SM4

	help

	  Length-preserving ciphers: SM4 cipher algorithms

	  (OSCCA GB/T 32907-2016) with ECB, CBC, CFB, and CTR modes

	  (OSCCA GB/T 32907-2016) with ECB, CBC, and CTR modes



	  Architecture: x86_64 using:

	  - AES-NI (AES New Instructions)
@@ -210,7 +210,7 @@ config CRYPTO_SM4_AESNI_AVX_X86_64 
	  If unsure, say N.



config CRYPTO_SM4_AESNI_AVX2_X86_64

	tristate "Ciphers: SM4 with modes: ECB, CBC, CFB, CTR (AES-NI/AVX2)"

	tristate "Ciphers: SM4 with modes: ECB, CBC, CTR (AES-NI/AVX2)"

	depends on X86 && 64BIT

	select CRYPTO_SKCIPHER

	select CRYPTO_SIMD
@@ -219,7 +219,7 @@ config CRYPTO_SM4_AESNI_AVX2_X86_64 
	select CRYPTO_SM4_AESNI_AVX_X86_64

	help

	  Length-preserving ciphers: SM4 cipher algorithms

	  (OSCCA GB/T 32907-2016) with ECB, CBC, CFB, and CTR modes

	  (OSCCA GB/T 32907-2016) with ECB, CBC, and CTR modes



	  Architecture: x86_64 using:

	  - AES-NI (AES New Instructions)

arch/x86/crypto/sm4-aesni-avx-asm_64.S

+0 −52
Original line number Diff line number Diff line
@@ -534,55 +534,3 @@ SYM_TYPED_FUNC_START(sm4_aesni_avx_cbc_dec_blk8) 
	FRAME_END

	RET;

SYM_FUNC_END(sm4_aesni_avx_cbc_dec_blk8)
 


/*

 * void sm4_aesni_avx_cfb_dec_blk8(const u32 *rk, u8 *dst,

 *                                 const u8 *src, u8 *iv)

 */

SYM_TYPED_FUNC_START(sm4_aesni_avx_cfb_dec_blk8)

	/* input:

	 *	%rdi: round key array, CTX

	 *	%rsi: dst (8 blocks)

	 *	%rdx: src (8 blocks)

	 *	%rcx: iv

	 */

	FRAME_BEGIN



	/* Load input */

	vmovdqu (%rcx), RA0;

	vmovdqu 0 * 16(%rdx), RA1;

	vmovdqu 1 * 16(%rdx), RA2;

	vmovdqu 2 * 16(%rdx), RA3;

	vmovdqu 3 * 16(%rdx), RB0;

	vmovdqu 4 * 16(%rdx), RB1;

	vmovdqu 5 * 16(%rdx), RB2;

	vmovdqu 6 * 16(%rdx), RB3;



	/* Update IV */

	vmovdqu 7 * 16(%rdx), RNOT;

	vmovdqu RNOT, (%rcx);



	call __sm4_crypt_blk8;



	vpxor (0 * 16)(%rdx), RA0, RA0;

	vpxor (1 * 16)(%rdx), RA1, RA1;

	vpxor (2 * 16)(%rdx), RA2, RA2;

	vpxor (3 * 16)(%rdx), RA3, RA3;

	vpxor (4 * 16)(%rdx), RB0, RB0;

	vpxor (5 * 16)(%rdx), RB1, RB1;

	vpxor (6 * 16)(%rdx), RB2, RB2;

	vpxor (7 * 16)(%rdx), RB3, RB3;



	vmovdqu RA0, (0 * 16)(%rsi);

	vmovdqu RA1, (1 * 16)(%rsi);

	vmovdqu RA2, (2 * 16)(%rsi);

	vmovdqu RA3, (3 * 16)(%rsi);

	vmovdqu RB0, (4 * 16)(%rsi);

	vmovdqu RB1, (5 * 16)(%rsi);

	vmovdqu RB2, (6 * 16)(%rsi);

	vmovdqu RB3, (7 * 16)(%rsi);



	vzeroall;

	FRAME_END

	RET;

SYM_FUNC_END(sm4_aesni_avx_cfb_dec_blk8)

arch/x86/crypto/sm4-aesni-avx2-asm_64.S

+0 −55
Original line number Diff line number Diff line
@@ -439,58 +439,3 @@ SYM_TYPED_FUNC_START(sm4_aesni_avx2_cbc_dec_blk16) 
	FRAME_END

	RET;

SYM_FUNC_END(sm4_aesni_avx2_cbc_dec_blk16)
 


/*

 * void sm4_aesni_avx2_cfb_dec_blk16(const u32 *rk, u8 *dst,

 *                                   const u8 *src, u8 *iv)

 */

SYM_TYPED_FUNC_START(sm4_aesni_avx2_cfb_dec_blk16)

	/* input:

	 *	%rdi: round key array, CTX

	 *	%rsi: dst (16 blocks)

	 *	%rdx: src (16 blocks)

	 *	%rcx: iv

	 */

	FRAME_BEGIN



	vzeroupper;



	/* Load input */

	vmovdqu (%rcx), RNOTx;

	vinserti128 $1, (%rdx), RNOT, RA0;

	vmovdqu (0 * 32 + 16)(%rdx), RA1;

	vmovdqu (1 * 32 + 16)(%rdx), RA2;

	vmovdqu (2 * 32 + 16)(%rdx), RA3;

	vmovdqu (3 * 32 + 16)(%rdx), RB0;

	vmovdqu (4 * 32 + 16)(%rdx), RB1;

	vmovdqu (5 * 32 + 16)(%rdx), RB2;

	vmovdqu (6 * 32 + 16)(%rdx), RB3;



	/* Update IV */

	vmovdqu (7 * 32 + 16)(%rdx), RNOTx;

	vmovdqu RNOTx, (%rcx);



	call __sm4_crypt_blk16;



	vpxor (0 * 32)(%rdx), RA0, RA0;

	vpxor (1 * 32)(%rdx), RA1, RA1;

	vpxor (2 * 32)(%rdx), RA2, RA2;

	vpxor (3 * 32)(%rdx), RA3, RA3;

	vpxor (4 * 32)(%rdx), RB0, RB0;

	vpxor (5 * 32)(%rdx), RB1, RB1;

	vpxor (6 * 32)(%rdx), RB2, RB2;

	vpxor (7 * 32)(%rdx), RB3, RB3;



	vmovdqu RA0, (0 * 32)(%rsi);

	vmovdqu RA1, (1 * 32)(%rsi);

	vmovdqu RA2, (2 * 32)(%rsi);

	vmovdqu RA3, (3 * 32)(%rsi);

	vmovdqu RB0, (4 * 32)(%rsi);

	vmovdqu RB1, (5 * 32)(%rsi);

	vmovdqu RB2, (6 * 32)(%rsi);

	vmovdqu RB3, (7 * 32)(%rsi);



	vzeroall;

	FRAME_END

	RET;

SYM_FUNC_END(sm4_aesni_avx2_cfb_dec_blk16)

arch/x86/crypto/sm4-avx.h

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ int sm4_cbc_encrypt(struct skcipher_request *req); 
int sm4_avx_cbc_decrypt(struct skcipher_request *req,

			unsigned int bsize, sm4_crypt_func func);



int sm4_cfb_encrypt(struct skcipher_request *req);

int sm4_avx_cfb_decrypt(struct skcipher_request *req,

			unsigned int bsize, sm4_crypt_func func);



int sm4_avx_ctr_crypt(struct skcipher_request *req,

			unsigned int bsize, sm4_crypt_func func);

arch/x86/crypto/sm4_aesni_avx2_glue.c

+0 −26
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ asmlinkage void sm4_aesni_avx2_ctr_enc_blk16(const u32 *rk, u8 *dst, 
					const u8 *src, u8 *iv);

asmlinkage void sm4_aesni_avx2_cbc_dec_blk16(const u32 *rk, u8 *dst,

					const u8 *src, u8 *iv);

asmlinkage void sm4_aesni_avx2_cfb_dec_blk16(const u32 *rk, u8 *dst,

					const u8 *src, u8 *iv);



static int sm4_skcipher_setkey(struct crypto_skcipher *tfm, const u8 *key,

			unsigned int key_len)
@@ -41,12 +39,6 @@ static int cbc_decrypt(struct skcipher_request *req) 
}





static int cfb_decrypt(struct skcipher_request *req)

{

	return sm4_avx_cfb_decrypt(req, SM4_CRYPT16_BLOCK_SIZE,

				sm4_aesni_avx2_cfb_dec_blk16);

}



static int ctr_crypt(struct skcipher_request *req)

{

	return sm4_avx_ctr_crypt(req, SM4_CRYPT16_BLOCK_SIZE,
@@ -87,24 +79,6 @@ static struct skcipher_alg sm4_aesni_avx2_skciphers[] = { 
		.setkey		= sm4_skcipher_setkey,

		.encrypt	= sm4_cbc_encrypt,

		.decrypt	= cbc_decrypt,

	}, {

		.base = {

			.cra_name		= "__cfb(sm4)",

			.cra_driver_name	= "__cfb-sm4-aesni-avx2",

			.cra_priority		= 500,

			.cra_flags		= CRYPTO_ALG_INTERNAL,

			.cra_blocksize		= 1,

			.cra_ctxsize		= sizeof(struct sm4_ctx),

			.cra_module		= THIS_MODULE,

		},

		.min_keysize	= SM4_KEY_SIZE,

		.max_keysize	= SM4_KEY_SIZE,

		.ivsize		= SM4_BLOCK_SIZE,

		.chunksize	= SM4_BLOCK_SIZE,

		.walksize	= 16 * SM4_BLOCK_SIZE,

		.setkey		= sm4_skcipher_setkey,

		.encrypt	= sm4_cfb_encrypt,

		.decrypt	= cfb_decrypt,

	}, {

		.base = {

			.cra_name		= "__ctr(sm4)",