Commit e3299a4c authored by Chang S. Bae's avatar Chang S. Bae Committed by Herbert Xu
Browse files

crypto: x86/aesni - Update aesni_set_key() to return void 



The aesni_set_key() implementation has no error case, yet its prototype
specifies to return an error code.

Modify the function prototype to return void and adjust the related code.

Signed-off-by: default avatarChang S. Bae <chang.seok.bae@intel.com>
Reviewed-by: default avatarEric Biggers <ebiggers@google.com>
Cc: Eric Biggers <ebiggers@kernel.org>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: linux-crypto@vger.kernel.org
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d50b35f0

arch/x86/crypto/aesni-intel_asm.S

+2 −3
Original line number Diff line number Diff line
@@ -1820,7 +1820,7 @@ SYM_FUNC_START_LOCAL(_key_expansion_256b) 
SYM_FUNC_END(_key_expansion_256b)



/*

 * int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

 * void aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

 *                    unsigned int key_len)

 */

SYM_FUNC_START(aesni_set_key)
@@ -1926,7 +1926,6 @@ SYM_FUNC_START(aesni_set_key) 
	sub $0x10, UKEYP

	cmp TKEYP, KEYP

	jb .Ldec_key_loop

	xor AREG, AREG

#ifndef __x86_64__

	popl KEYP

#endif

arch/x86/crypto/aesni-intel_glue.c

+4 −4
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ static inline void *aes_align_addr(void *addr) 
	return PTR_ALIGN(addr, AESNI_ALIGN);

}



asmlinkage int aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

asmlinkage void aesni_set_key(struct crypto_aes_ctx *ctx, const u8 *in_key,

			      unsigned int key_len);

asmlinkage void aesni_enc(const void *ctx, u8 *out, const u8 *in);

asmlinkage void aesni_dec(const void *ctx, u8 *out, const u8 *in);
@@ -241,9 +241,9 @@ static int aes_set_key_common(struct crypto_aes_ctx *ctx, 
		return err;



	kernel_fpu_begin();

	err = aesni_set_key(ctx, in_key, key_len);

	aesni_set_key(ctx, in_key, key_len);

	kernel_fpu_end();

	return err;

	return 0;

}



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