diff options
| author | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2016-06-30 21:34:46 +0300 |
|---|---|---|
| committer | Jussi Kivilinna <jussi.kivilinna@iki.fi> | 2016-06-30 21:34:46 +0300 |
| commit | a6158a01a4d81a5d862e1e0a60bfd6063443311d (patch) | |
| tree | 8ef35a65240b5c4c74ef88aaad5f21e472ad77c0 /cipher/sha512-arm.S | |
| parent | a09126242a51c4ea4564b0f70b808e4f27fe5a91 (diff) | |
| download | libgcrypt-a6158a01a4d81a5d862e1e0a60bfd6063443311d.tar.gz | |
Avoid unaligned accesses with ARM ldm/stm instructions
* cipher/rijndael-arm.S: Remove __ARM_FEATURE_UNALIGNED ifdefs, always
compile with unaligned load/store code paths.
* cipher/sha512-arm.S: Ditto.
--
Reported-by: Michael Plass <mfpnb@plass-family.net>
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
Diffstat (limited to 'cipher/sha512-arm.S')
| -rw-r--r-- | cipher/sha512-arm.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cipher/sha512-arm.S b/cipher/sha512-arm.S index 28f156ea..94ec0141 100644 --- a/cipher/sha512-arm.S +++ b/cipher/sha512-arm.S @@ -323,7 +323,7 @@ _gcry_sha512_transform_arm: stm RWhi, {RT1lo,RT1hi,RT2lo,RT2hi,RT3lo,RT3hi,RT4lo,RT4hi} /* Load input to w[16] */ -#ifndef __ARM_FEATURE_UNALIGNED + /* test if data is unaligned */ tst %r1, #3; beq 1f; @@ -341,7 +341,6 @@ _gcry_sha512_transform_arm: read_be64_unaligned_4(%r1, 12 * 8, RT1lo, RT1hi, RT2lo, RT2hi, RT3lo, RT3hi, RT4lo, RT4hi, RWlo); b 2f; -#endif 1: /* aligned load */ add RWhi, %sp, #(w(0)); |