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

(cherry picked from commit 797d24bee9523e5cac14fe82a4dad356d1ec67f9)

diff --git a/crypto/sha/asm/sha1-armv4-large.pl b/crypto/sha/asm/sha1-armv4-large.pl
index c0e3b80f0ea30ea8a44ea02d770528e8c5673868..43a1b9fd7f65a936af36209a235a3fa866619a8f 100644 (file)
--- a/crypto/sha/asm/sha1-armv4-large.pl
+++ b/crypto/sha/asm/sha1-armv4-large.pl
@@ -178,9 +178,9 @@ sha1_block_data_order:
        sub     r3,pc,#8                @ sha1_block_data_order
        ldr     r12,.LOPENSSL_armcap
        ldr     r12,[r3,r12]            @ OPENSSL_armcap_P
-       tst     r12,#8
+       tst     r12,#ARMV8_SHA1
        bne     .LARMv8
-       tst     r12,#1
+       tst     r12,#ARMV7_NEON
        bne     .LNEON
 #endif
        stmdb   sp!,{r4-r12,lr}

diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 7980debd14962bf397c15cf74d2335d92646b011..5e5c54ec18549958235a710ba2f8efdf521a0f65 100644 (file)
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -189,9 +189,9 @@ sha256_block_data_order:
 #if __ARM_ARCH__>=7
        ldr     r12,.LOPENSSL_armcap
        ldr     r12,[r3,r12]            @ OPENSSL_armcap_P
-       tst     r12,#8
+       tst     r12,#ARMV8_SHA256
        bne     .LARMv8
-       tst     r12,#1
+       tst     r12,#ARMV7_NEON
        bne     .LNEON
 #endif
        stmdb   sp!,{$ctx,$inp,$len,r4-r11,lr}