Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

+10 -2
+4 -2
arch/arm/crypto/speck-neon-core.S
··· 272 272 * Allocate stack space to store 128 bytes worth of tweaks. For 273 273 * performance, this space is aligned to a 16-byte boundary so that we 274 274 * can use the load/store instructions that declare 16-byte alignment. 275 + * For Thumb2 compatibility, don't do the 'bic' directly on 'sp'. 275 276 */ 276 - sub sp, #128 277 - bic sp, #0xf 277 + sub r12, sp, #128 278 + bic r12, #0xf 279 + mov sp, r12 278 280 279 281 .if \n == 64 280 282 // Load first tweak
+1
arch/x86/crypto/aegis128-aesni-asm.S
··· 535 535 movdqu STATE3, 0x40(STATEP) 536 536 537 537 FRAME_END 538 + ret 538 539 ENDPROC(crypto_aegis128_aesni_enc_tail) 539 540 540 541 .macro decrypt_block a s0 s1 s2 s3 s4 i
+1
arch/x86/crypto/aegis128l-aesni-asm.S
··· 645 645 state_store0 646 646 647 647 FRAME_END 648 + ret 648 649 ENDPROC(crypto_aegis128l_aesni_enc_tail) 649 650 650 651 /*
+1
arch/x86/crypto/aegis256-aesni-asm.S
··· 543 543 state_store0 544 544 545 545 FRAME_END 546 + ret 546 547 ENDPROC(crypto_aegis256_aesni_enc_tail) 547 548 548 549 /*
+1
arch/x86/crypto/morus1280-avx2-asm.S
··· 453 453 vmovdqu STATE4, (4 * 32)(%rdi) 454 454 455 455 FRAME_END 456 + ret 456 457 ENDPROC(crypto_morus1280_avx2_enc_tail) 457 458 458 459 /*
+1
arch/x86/crypto/morus1280-sse2-asm.S
··· 652 652 movdqu STATE4_HI, (9 * 16)(%rdi) 653 653 654 654 FRAME_END 655 + ret 655 656 ENDPROC(crypto_morus1280_sse2_enc_tail) 656 657 657 658 /*
+1
arch/x86/crypto/morus640-sse2-asm.S
··· 437 437 movdqu STATE4, (4 * 16)(%rdi) 438 438 439 439 FRAME_END 440 + ret 440 441 ENDPROC(crypto_morus640_sse2_enc_tail) 441 442 442 443 /*