summaryrefslogtreecommitdiffhomepage
path: root/src/crypto
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2018-09-30 04:14:22 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2018-10-02 15:26:03 +0200
commit12ec009136ef4558741901643be60915947ebe99 (patch)
tree4f96640ea9011765387d4f418c35cd0a68c159f2 /src/crypto
parent8c990653050ed7f4c9a6155b0960151dd5e85579 (diff)
chacha20-arm: use proper reteq macro instead of bxeq
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'src/crypto')
-rw-r--r--src/crypto/zinc/chacha20/chacha20-arm.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/crypto/zinc/chacha20/chacha20-arm.S b/src/crypto/zinc/chacha20/chacha20-arm.S
index 5abedaf..79ed18f 100644
--- a/src/crypto/zinc/chacha20/chacha20-arm.S
+++ b/src/crypto/zinc/chacha20/chacha20-arm.S
@@ -6,6 +6,7 @@
*/
#include <linux/linkage.h>
+#include <asm/assembler.h>
/*
* The following scalar routine was written by Eric Biggers.
@@ -399,7 +400,7 @@
*/
ENTRY(chacha20_arm)
cmp r2, #0 // len == 0?
- bxeq lr
+ reteq lr
push {r0-r2,r4-r11,lr}