]> git.karo-electronics.de Git - linux-beck.git/commitdiff
crypto: arm64/sha2-ce - fix for big endian
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 11 Oct 2016 18:15:16 +0000 (19:15 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jan 2017 10:39:33 +0000 (11:39 +0100)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/crypto/sha2-ce-core.S

index 5df9d9d470adb53156ae88acd785fdf0b78c43bd..01cfee066837cd9a65f6d54d8a27d4916e5a1675 100644 (file)
@@ -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)