aboutsummaryrefslogtreecommitdiff
path: root/crypto/chacha
diff options
context:
space:
mode:
authorDavid Benjamin <davidben@google.com>2016-02-23 11:41:55 -0500
committerAndy Polyakov <appro@openssl.org>2016-03-02 12:57:28 +0100
commitbdbd3aea590e45d52c7b120ea6eaff38295b5011 (patch)
tree70fa79f287cb3d6913fa3d55d44af02681eca96f /crypto/chacha
parent359aa38fbeecd920a60c739c64cda06fe295684f (diff)
downloadopenssl-bdbd3aea590e45d52c7b120ea6eaff38295b5011.zip
openssl-bdbd3aea590e45d52c7b120ea6eaff38295b5011.tar.gz
openssl-bdbd3aea590e45d52c7b120ea6eaff38295b5011.tar.bz2
Consistently use arm_arch.h constants in armcap assembly code.
Most of the assembly uses constants from arm_arch.h, but a few references to ARMV7_NEON don't. Consistently use the macros everywhere. Signed-off-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'crypto/chacha')
-rwxr-xr-xcrypto/chacha/asm/chacha-armv4.pl2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index 6c20755..4545101 100755
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -214,7 +214,7 @@ ChaCha20_ctr32:
# ifdef __APPLE__
ldr r4,[r4]
# endif
- tst r4,#1
+ tst r4,#ARMV7_NEON
bne .LChaCha20_neon
.Lshort:
#endif