Add an Ed25519 signature maleability test

[openssl.git] / crypto / chacha / asm / chacha-armv4.pl

diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index 5b3e7be78108608a9edb93cbd5aa4c454252e855..d3fadcc63d3338e25f0eadb41d2c6ce435410413 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -15,7 +15,7 @@
 # ====================================================================
 #
 # December 2014
-# 
+#
 # ChaCha20 for ARMv4.
 #
 # Performance in cycles per byte out of large buffer.
@@ -172,8 +172,10 @@ $code.=<<___;
 #include "arm_arch.h"
 
 .text
-#if defined(__thumb2__)
+#if defined(__thumb2__) || defined(__clang__)
 .syntax        unified
+#endif
+#if defined(__thumb2__)
 .thumb
 #else
 .code  32
@@ -720,7 +722,7 @@ ChaCha20_neon:
        vadd.i32        $d2,$d1,$t0             @ counter+2
        str             @t[3], [sp,#4*(16+15)]
        mov             @t[3],#10
-       add             @x[12],@x[12],#3        @ counter+3 
+       add             @x[12],@x[12],#3        @ counter+3
        b               .Loop_neon
 
 .align 4
@@ -1134,7 +1136,7 @@ $code.=<<___;
        ldrb            @t[1],[r12],#1          @ read input
        subs            @t[3],@t[3],#1
        eor             @t[0],@t[0],@t[1]
-       strb            @t[0],[r14],#1          @ store ouput
+       strb            @t[0],[r14],#1          @ store output
        bne             .Loop_tail_neon
 
 .Ldone_neon: