generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sha[1|256]-armv4: harmonize with arm_arch.h.

Browse Source 
(cherry picked from commit 797d24bee9523e5cac14fe82a4dad356d1ec67f9)
This commit is contained in:
Andy Polyakov 2014-06-01 22:29:50 +02:00
parent f5247cea39
commit 1f72a76f98
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crypto/sha/asm/sha1-armv4-large.pl
View File

@ -178,9 +178,9 @@ sha1_block_data_order:
sub r3,pc,#8 @ sha1_block_data_order sub r3,pc,#8 @ sha1_block_data_order
ldr r12,.LOPENSSL_armcap ldr r12,.LOPENSSL_armcap
ldr r12,[r3,r12] @ OPENSSL_armcap_P ldr r12,[r3,r12] @ OPENSSL_armcap_P
tst r12,#8 tst r12,#ARMV8_SHA1
bne .LARMv8 bne .LARMv8
tst r12,#1 tst r12,#ARMV7_NEON
bne .LNEON bne .LNEON
#endif #endif
stmdb sp!,{r4-r12,lr} stmdb sp!,{r4-r12,lr}

4
crypto/sha/asm/sha256-armv4.pl
View File

@ -189,9 +189,9 @@ sha256_block_data_order:
#if __ARM_ARCH__>=7 #if __ARM_ARCH__>=7
ldr r12,.LOPENSSL_armcap ldr r12,.LOPENSSL_armcap
ldr r12,[r3,r12] @ OPENSSL_armcap_P ldr r12,[r3,r12] @ OPENSSL_armcap_P
tst r12,#8 tst r12,#ARMV8_SHA256
bne .LARMv8 bne .LARMv8
tst r12,#1 tst r12,#ARMV7_NEON
bne .LNEON bne .LNEON
#endif #endif
stmdb sp!,{$ctx,$inp,$len,r4-r11,lr} stmdb sp!,{$ctx,$inp,$len,r4-r11,lr}