diff options
| author |   Eric Biggers <ebiggers@google.com> | 2019-02-22 22:54:08 -0800 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-02-28 14:37:48 +0800 |
| commit | f86d17e9efe010b894db231329ee36b24bcc1b24 (patch) | |
| tree | e94ae38cfe1a3e9bbbc41765a1aa10de14097f84 | |
| parent | crypto: arm64/chacha - fix chacha_4block_xor_neon() for big endian (diff) | |
| download | linux-dev-f86d17e9efe010b894db231329ee36b24bcc1b24.tar.xz linux-dev-f86d17e9efe010b894db231329ee36b24bcc1b24.zip | |
crypto: arm64/chacha - fix hchacha_block_neon() for big endian
On big endian arm64 kernels, the xchacha20-neon and xchacha12-neon
self-tests fail because hchacha_block_neon() outputs little endian words
but the C code expects native endianness. Fix it to output the words in
native endianness (which also makes it match the arm32 version).
Fixes: cc7cf991e9eb ("crypto: arm64/chacha20 - add XChaCha20 support")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | arch/arm64/crypto/chacha-neon-core.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/crypto/chacha-neon-core.S b/arch/arm64/crypto/chacha-neon-core.S index bfb80e10ff7b..706c4e10e9e2 100644 --- a/arch/arm64/crypto/chacha-neon-core.S +++ b/arch/arm64/crypto/chacha-neon-core.S @@ -158,8 +158,8 @@ ENTRY(hchacha_block_neon) mov w3, w2 bl chacha_permute - st1 {v0.16b}, [x1], #16 - st1 {v3.16b}, [x1] + st1 {v0.4s}, [x1], #16 + st1 {v3.4s}, [x1] ldp x29, x30, [sp], #16 ret |