Browse Source

crypto: arm64/sha1-ce - fix for big endian

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>
Ard Biesheuvel 8 years ago
parent
commit
ee71e5f1e7
1 changed files with 2 additions and 2 deletions
  1. 2 2
      arch/arm64/crypto/sha1-ce-core.S

+ 2 - 2
arch/arm64/crypto/sha1-ce-core.S

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