aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2016-08-31 20:30:49 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2016-08-31 20:30:49 +0000
commit27279c93d1d75b12546780fe823794dce6a0c3d8 (patch)
treefff9503ad9e2633ea0ef1d205400520c9acf02a2 /crypto
parentdcd9f4f344c8b5f197c7d9d46d49fec28269699f (diff)
downloadsrc-27279c93d1d75b12546780fe823794dce6a0c3d8.tar.gz
src-27279c93d1d75b12546780fe823794dce6a0c3d8.zip
MFC: r304636
Build OpenSSL assembly sources for arm.
Notes
Notes: svn path=/stable/11/; revision=305152
Diffstat (limited to 'crypto')
-rwxr-xr-xcrypto/openssl/crypto/bn/asm/armv4-gf2m.pl4
-rwxr-xr-xcrypto/openssl/crypto/sha/asm/sha256-armv4.pl2
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl b/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
index 72381a77240c..348ce40d4b8d 100755
--- a/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
+++ b/crypto/openssl/crypto/bn/asm/armv4-gf2m.pl
@@ -213,8 +213,8 @@ $code.=<<___;
.align 5
.LNEON:
ldr r12, [sp] @ 5th argument
- vmov.32 $a, r2, r1
- vmov.32 $b, r12, r3
+ vmov $a, r2, r1
+ vmov $b, r12, r3
vmov.i64 $k48, #0x0000ffffffffffff
vmov.i64 $k32, #0x00000000ffffffff
vmov.i64 $k16, #0x000000000000ffff
diff --git a/crypto/openssl/crypto/sha/asm/sha256-armv4.pl b/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
index 4fee74d832d1..bc9b4a07bb68 100755
--- a/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/openssl/crypto/sha/asm/sha256-armv4.pl
@@ -595,7 +595,7 @@ sha256_block_data_order_armv8:
adr $Ktbl,.LARMv8
sub $Ktbl,$Ktbl,#.LARMv8-K256
# else
- adrl $Ktbl,K256
+ sub $Ktbl,$Ktbl,#256+32
# endif
add $len,$inp,$len,lsl#6 @ len to point at the end of inp