crypto: arm64/sha1-ce - fix for big endian
authorArd Biesheuvel <ard.biesheuvel@linaro.org>
Tue, 11 Oct 2016 18:15:15 +0000 (19:15 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 12 Jan 2017 10:22:50 +0000 (11:22 +0100)
commit ee71e5f1e7d25543ee63a80451871f8985b8d431 upstream.

The SHA1 digest is an array of 5 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 4x4 vector
ones where appropriate.

Fixes: 2c98833a42cd ("arm64/crypto: SHA-1 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/sha1-ce-core.S

index 033aae6d732a14464d0167e9aaee5e4e9c1a427b..c98e7e849f06f460d99cbddbe31aee73c8d1c686 100644 (file)
@@ -78,7 +78,7 @@ ENTRY(sha1_ce_transform)
        ld1r            {k3.4s}, [x6]
 
        /* load state */
-       ldr             dga, [x0]
+       ld1             {dgav.4s}, [x0]
        ldr             dgb, [x0, #16]
 
        /* load sha1_ce_state::finalize */
@@ -144,7 +144,7 @@ CPU_LE(     rev32           v11.16b, v11.16b        )
        b               1b
 
        /* store new state */
-3:     str             dga, [x0]
+3:     st1             {dgav.4s}, [x0]
        str             dgb, [x0, #16]
        ret
 ENDPROC(sha1_ce_transform)