Commit 09149997 authored by Herbert Xu's avatar Herbert Xu
Browse files

crypto: aegis128 - Move simd prototypes into aegis.h 



This patch fixes missing prototype warnings in crypto/aegis128-neon.c.

Fixes: a4397635 ("crypto: aegis128 - provide a SIMD...")
Reported-by: default avatarkernel test robot <lkp@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Acked-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent aa31e559

crypto/aegis.h

+19 −0
Original line number Diff line number Diff line
@@ -21,9 +21,28 @@ union aegis_block { 
	u8 bytes[AEGIS_BLOCK_SIZE];

};



struct aegis_state;



extern int aegis128_have_aes_insn;



#define AEGIS_BLOCK_ALIGN (__alignof__(union aegis_block))

#define AEGIS_ALIGNED(p) IS_ALIGNED((uintptr_t)p, AEGIS_BLOCK_ALIGN)



bool crypto_aegis128_have_simd(void);

void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg);

void crypto_aegis128_init_simd(struct aegis_state *state,

			       const union aegis_block *key,

			       const u8 *iv);

void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size);

void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size);

int crypto_aegis128_final_simd(struct aegis_state *state,

			       union aegis_block *tag_xor,

			       unsigned int assoclen,

			       unsigned int cryptlen,

			       unsigned int authsize);



static __always_inline void crypto_aegis_block_xor(union aegis_block *dst,

						   const union aegis_block *src)

{

crypto/aegis128-core.c

+0 −15
Original line number Diff line number Diff line
@@ -58,21 +58,6 @@ static bool aegis128_do_simd(void) 
	return false;

}



bool crypto_aegis128_have_simd(void);

void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg);

void crypto_aegis128_init_simd(struct aegis_state *state,

			       const union aegis_block *key,

			       const u8 *iv);

void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size);

void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size);

int crypto_aegis128_final_simd(struct aegis_state *state,

			       union aegis_block *tag_xor,

			       unsigned int assoclen,

			       unsigned int cryptlen,

			       unsigned int authsize);



static void crypto_aegis128_update(struct aegis_state *state)

{

	union aegis_block tmp;

crypto/aegis128-neon.c

+5 −5
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ bool crypto_aegis128_have_simd(void) 
	return IS_ENABLED(CONFIG_ARM64);

}



void crypto_aegis128_init_simd(union aegis_block *state,

void crypto_aegis128_init_simd(struct aegis_state *state,

			       const union aegis_block *key,

			       const u8 *iv)

{
@@ -39,14 +39,14 @@ void crypto_aegis128_init_simd(union aegis_block *state, 
	kernel_neon_end();

}



void crypto_aegis128_update_simd(union aegis_block *state, const void *msg)

void crypto_aegis128_update_simd(struct aegis_state *state, const void *msg)

{

	kernel_neon_begin();

	crypto_aegis128_update_neon(state, msg);

	kernel_neon_end();

}



void crypto_aegis128_encrypt_chunk_simd(union aegis_block *state, u8 *dst,

void crypto_aegis128_encrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size)

{

	kernel_neon_begin();
@@ -54,7 +54,7 @@ void crypto_aegis128_encrypt_chunk_simd(union aegis_block *state, u8 *dst, 
	kernel_neon_end();

}



void crypto_aegis128_decrypt_chunk_simd(union aegis_block *state, u8 *dst,

void crypto_aegis128_decrypt_chunk_simd(struct aegis_state *state, u8 *dst,

					const u8 *src, unsigned int size)

{

	kernel_neon_begin();
@@ -62,7 +62,7 @@ void crypto_aegis128_decrypt_chunk_simd(union aegis_block *state, u8 *dst, 
	kernel_neon_end();

}



int crypto_aegis128_final_simd(union aegis_block *state,

int crypto_aegis128_final_simd(struct aegis_state *state,

			       union aegis_block *tag_xor,

			       unsigned int assoclen,

			       unsigned int cryptlen,