summaryrefslogtreecommitdiff
path: root/linux-arm
diff options
context:
space:
mode:
authorRobert Sloan <varomodt@google.com>2017-02-21 08:49:28 -0800
committerRobert Sloan <varomodt@google.com>2017-02-21 08:49:42 -0800
commita94fe0531b3c196ad078174259af2201b2e3a246 (patch)
tree81f252f2c833966b0a5d3ec52e71c3f9dbeca499 /linux-arm
parent5d625781eb8ff5cc8111d2302efe900103bf0ade (diff)
downloadboringssl-a94fe0531b3c196ad078174259af2201b2e3a246.tar.gz
external/boringssl: Sync to c4796c92e0aced2342ed5687201aea07189c3bc1.
This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/040bc4944be97f5d4b44da176f6e801fc804a176..c4796c92e0aced2342ed5687201aea07189c3bc1 Test: CtsLibcoreTestCases Presubmits Change-Id: If6d911660fbd9c60896527addb277c8225c3d401
Diffstat (limited to 'linux-arm')
-rw-r--r--linux-arm/crypto/chacha/chacha-armv4.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-arm/crypto/chacha/chacha-armv4.S b/linux-arm/crypto/chacha/chacha-armv4.S
index 19a4d2c4..0784fc71 100644
--- a/linux-arm/crypto/chacha/chacha-armv4.S
+++ b/linux-arm/crypto/chacha/chacha-armv4.S
@@ -1457,7 +1457,7 @@ ChaCha20_neon:
ldrb r9,[r12],#1 @ read input
subs r11,r11,#1
eor r8,r8,r9
- strb r8,[r14],#1 @ store ouput
+ strb r8,[r14],#1 @ store output
bne .Loop_tail_neon
.Ldone_neon: