diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-10-11 19:15:19 +0100 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2016-10-21 11:03:45 +0800 |
| commit | caf4b9e2b326cc2a5005a5c557274306536ace61 (patch) | |
| tree | 27737da2ba2a6598dbe13dc2ecdac25b27327d69 /arch/arm64/crypto | |
| parent | a2c435cc99862fd3d165e1b66bf48ac72c839c62 (diff) | |
| download | linux-caf4b9e2b326cc2a5005a5c557274306536ace61.tar.gz linux-caf4b9e2b326cc2a5005a5c557274306536ace61.tar.bz2 linux-caf4b9e2b326cc2a5005a5c557274306536ace61.zip | |
crypto: arm64/aes-xts-ce: fix for big endian
Emit the XTS tweak literal constants in the appropriate order for a
single 128-bit scalar literal load.
Fixes: 49788fe2a128 ("arm64/crypto: AES-ECB/CBC/CTR/XTS using ARMv8 NEON and Crypto Extensions")
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch/arm64/crypto')
| -rw-r--r-- | arch/arm64/crypto/aes-ce.S | 1 | ||||
| -rw-r--r-- | arch/arm64/crypto/aes-modes.S | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm64/crypto/aes-ce.S b/arch/arm64/crypto/aes-ce.S index 78f3cfe92c08..b46093d567e5 100644 --- a/arch/arm64/crypto/aes-ce.S +++ b/arch/arm64/crypto/aes-ce.S @@ -10,6 +10,7 @@ */ #include <linux/linkage.h> +#include <asm/assembler.h> #define AES_ENTRY(func) ENTRY(ce_ ## func) #define AES_ENDPROC(func) ENDPROC(ce_ ## func) diff --git a/arch/arm64/crypto/aes-modes.S b/arch/arm64/crypto/aes-modes.S index f6e372c528eb..c53dbeae79f2 100644 --- a/arch/arm64/crypto/aes-modes.S +++ b/arch/arm64/crypto/aes-modes.S @@ -386,7 +386,8 @@ AES_ENDPROC(aes_ctr_encrypt) .endm .Lxts_mul_x: - .word 1, 0, 0x87, 0 +CPU_LE( .quad 1, 0x87 ) +CPU_BE( .quad 0x87, 1 ) AES_ENTRY(aes_xts_encrypt) FRAME_PUSH |