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

Commit 124b99fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 

Pull crypto fixes from Herbert Xu:

 - add missing RETs in x86 aegis/morus

 - fix build error in arm speck

* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: x86 - Add missing RETs
  crypto: arm/speck - fix building in Thumb2 mode
parents 70a2dc6a 221e00d1

arch/arm/crypto/speck-neon-core.S

+4 −2
Original line number Diff line number Diff line
@@ -272,9 +272,11 @@ 
	 * Allocate stack space to store 128 bytes worth of tweaks.  For

	 * performance, this space is aligned to a 16-byte boundary so that we

	 * can use the load/store instructions that declare 16-byte alignment.

	 * For Thumb2 compatibility, don't do the 'bic' directly on 'sp'.

	 */

	sub		sp, #128

	bic		sp, #0xf

	sub		r12, sp, #128

	bic		r12, #0xf

	mov		sp, r12



.if \n == 64

	// Load first tweak

arch/x86/crypto/aegis128-aesni-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -535,6 +535,7 @@ ENTRY(crypto_aegis128_aesni_enc_tail) 
	movdqu STATE3, 0x40(STATEP)



	FRAME_END

	ret

ENDPROC(crypto_aegis128_aesni_enc_tail)



.macro decrypt_block a s0 s1 s2 s3 s4 i

arch/x86/crypto/aegis128l-aesni-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -645,6 +645,7 @@ ENTRY(crypto_aegis128l_aesni_enc_tail) 
	state_store0



	FRAME_END

	ret

ENDPROC(crypto_aegis128l_aesni_enc_tail)



/*

arch/x86/crypto/aegis256-aesni-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ ENTRY(crypto_aegis256_aesni_enc_tail) 
	state_store0



	FRAME_END

	ret

ENDPROC(crypto_aegis256_aesni_enc_tail)



/*

arch/x86/crypto/morus1280-avx2-asm.S

+1 −0
Original line number Diff line number Diff line
@@ -453,6 +453,7 @@ ENTRY(crypto_morus1280_avx2_enc_tail) 
	vmovdqu STATE4, (4 * 32)(%rdi)



	FRAME_END

	ret

ENDPROC(crypto_morus1280_avx2_enc_tail)



/*