| From 633f300d6d02dc2fe627126cf05a4ae272be37c1 Mon Sep 17 00:00:00 2001 |
| From: Ard Biesheuvel <ard.biesheuvel@linaro.org> |
| Date: Tue, 11 Oct 2016 19:15:16 +0100 |
| Subject: [PATCH] crypto: arm64/sha2-ce - fix for big endian |
| |
| commit 174122c39c369ed924d2608fc0be0171997ce800 upstream. |
| |
| The SHA256 digest is an array of 8 32-bit quantities, so we should refer |
| to them as such in order for this code to work correctly when built for |
| big endian. So replace 16 byte scalar loads and stores with 4x32 vector |
| ones where appropriate. |
| |
| Fixes: 6ba6c74dfc6b ("arm64/crypto: SHA-224/SHA-256 using ARMv8 Crypto Extensions") |
| Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> |
| Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm64/crypto/sha2-ce-core.S b/arch/arm64/crypto/sha2-ce-core.S |
| index 5df9d9d470ad..01cfee066837 100644 |
| --- a/arch/arm64/crypto/sha2-ce-core.S |
| +++ b/arch/arm64/crypto/sha2-ce-core.S |
| @@ -85,7 +85,7 @@ ENTRY(sha2_ce_transform) |
| ld1 {v12.4s-v15.4s}, [x8] |
| |
| /* load state */ |
| - ldp dga, dgb, [x0] |
| + ld1 {dgav.4s, dgbv.4s}, [x0] |
| |
| /* load sha256_ce_state::finalize */ |
| ldr w4, [x0, #:lo12:sha256_ce_offsetof_finalize] |
| @@ -148,6 +148,6 @@ CPU_LE( rev32 v19.16b, v19.16b ) |
| b 1b |
| |
| /* store new state */ |
| -3: stp dga, dgb, [x0] |
| +3: st1 {dgav.4s, dgbv.4s}, [x0] |
| ret |
| ENDPROC(sha2_ce_transform) |
| -- |
| 2.10.1 |
| |
