diff options
| author | slontis <shane.lontis@oracle.com> | 2023-11-14 11:40:09 +1000 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2023-11-15 09:02:30 +0100 |
| commit | f5a63bf1c02cf0605ce3f5614cd016c3750766d3 (patch) | |
| tree | 3de4388478f1e620d8e84463d4920772bbd72c22 /crypto/sha | |
| parent | 86db958835d1f8ba9ce49a9f93b5309c3d13b91c (diff) | |
Fix SHA3_squeeze on armv4.
For armv4 - Only the first 4 parameters can be passed via registers
(r0..r3).
As all of the general registers are already used,
r11 was used to store the 'next' param.
R11 is now pushed/poped on entry/exit.
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22719)
Diffstat (limited to 'crypto/sha')
| -rwxr-xr-x | crypto/sha/asm/keccak1600-armv4.pl | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/crypto/sha/asm/keccak1600-armv4.pl b/crypto/sha/asm/keccak1600-armv4.pl index 18948fd7c0..f19076c248 100755 --- a/crypto/sha/asm/keccak1600-armv4.pl +++ b/crypto/sha/asm/keccak1600-armv4.pl @@ -932,19 +932,28 @@ SHA3_absorb: .size SHA3_absorb,.-SHA3_absorb ___ } -{ my ($out,$len,$A_flat,$bsz) = map("r$_", (4,5,10,12)); + +{ my ($out,$len,$A_flat,$bsz,$next) = map("r$_", (4,5,10,12,11)); + + +# void SHA3_squeeze(uint64_t A[5][5], +# unsigned char *out, size_t len, size_t r, int next) +# +# The first 4 parameters are passed in via r0..r3, +# next is passed on the stack [sp, #0] $code.=<<___; .global SHA3_squeeze .type SHA3_squeeze,%function .align 5 SHA3_squeeze: - stmdb sp!,{r0,r3-r10,lr} + stmdb sp!,{r0,r3-r11,lr} @ push 11 registers mov $A_flat,r0 mov $out,r1 mov $len,r2 mov $bsz,r3 + ldr $next, [sp, #48] @ next is after the 11 pushed registers (12*4) #ifdef __thumb2__ mov r9,#0x00ff00ff @@ -966,8 +975,8 @@ SHA3_squeeze: stmdb sp!,{r6-r9} mov r14,$A_flat - cmp r4, #0 @ r4 = 'next' argument - bne .Lnext_block + cmp $next, #1 + beq .Lnext_block b .Loop_squeeze .align 4 @@ -1081,9 +1090,9 @@ SHA3_squeeze: .Lsqueeze_done: add sp,sp,#24 #if __ARM_ARCH__>=5 - ldmia sp!,{r4-r10,pc} + ldmia sp!,{r4-r11,pc} #else - ldmia sp!,{r4-r10,lr} + ldmia sp!,{r4-r11,lr} tst lr,#1 moveq pc,lr @ be binary compatible with V4, yet bx lr @ interoperable with Thumb ISA:-) |