diff options
| author | kettenis <> | 2018-01-24 23:03:37 +0000 |
|---|---|---|
| committer | kettenis <> | 2018-01-24 23:03:37 +0000 |
| commit | ffa49cfcc71c84fb877cf150d758ca8420dcb2d2 (patch) | |
| tree | 7189f82b04c78fde1c13c21aaa10de0acd6432a3 /src/lib/libcrypto/sha | |
| parent | 1d8e5453558fbe5e97fd1becfef826a261de138b (diff) | |
| download | openbsd-ffa49cfcc71c84fb877cf150d758ca8420dcb2d2.tar.gz openbsd-ffa49cfcc71c84fb877cf150d758ca8420dcb2d2.tar.bz2 openbsd-ffa49cfcc71c84fb877cf150d758ca8420dcb2d2.zip | |
Make the NEON codepaths conditional on __STRICT_ALIGNMENT not being
defined as they rely on unaligned access.
ok joel@
Diffstat (limited to 'src/lib/libcrypto/sha')
| -rw-r--r-- | src/lib/libcrypto/sha/asm/sha512-armv4.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/sha/asm/sha512-armv4.pl b/src/lib/libcrypto/sha/asm/sha512-armv4.pl index 28ae155f4b..a247a00c2b 100644 --- a/src/lib/libcrypto/sha/asm/sha512-armv4.pl +++ b/src/lib/libcrypto/sha/asm/sha512-armv4.pl | |||
| @@ -229,7 +229,7 @@ WORD64(0x5fcb6fab,0x3ad6faec, 0x6c44198c,0x4a475817) | |||
| 229 | sha512_block_data_order: | 229 | sha512_block_data_order: |
| 230 | sub r3,pc,#8 @ sha512_block_data_order | 230 | sub r3,pc,#8 @ sha512_block_data_order |
| 231 | add $len,$inp,$len,lsl#7 @ len to point at the end of inp | 231 | add $len,$inp,$len,lsl#7 @ len to point at the end of inp |
| 232 | #if __ARM_ARCH__>=7 | 232 | #if __ARM_ARCH__>=7 && !defined(__STRICT_ALIGNMENT) |
| 233 | ldr r12,.LOPENSSL_armcap | 233 | ldr r12,.LOPENSSL_armcap |
| 234 | ldr r12,[r3,r12] @ OPENSSL_armcap_P | 234 | ldr r12,[r3,r12] @ OPENSSL_armcap_P |
| 235 | tst r12,#1 | 235 | tst r12,#1 |
| @@ -533,7 +533,7 @@ ___ | |||
| 533 | } | 533 | } |
| 534 | 534 | ||
| 535 | $code.=<<___; | 535 | $code.=<<___; |
| 536 | #if __ARM_ARCH__>=7 | 536 | #if __ARM_ARCH__>=7 && !defined(__STRICT_ALIGNMENT) |
| 537 | .fpu neon | 537 | .fpu neon |
| 538 | 538 | ||
| 539 | .align 4 | 539 | .align 4 |