diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-06-06 21:27:18 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-06-10 22:51:15 +0200 |
| commit | 3a97ebb16b0d1eaab83171b9220280dacd99bf04 (patch) | |
| tree | 89717093f8561e28fc5e6c40e02c8411d8eb0f48 /crypto/aes/asm | |
| parent | 16f4d2e32f1ea6cfa668ae64493998ae51db7e51 (diff) | |
ARM assembly pack: get ARMv7 instruction endianness right.
Pointer out and suggested by: Ard Biesheuvel.
(cherry picked from commit 5dcf70a1c57c2019bfad640fe14fd4a73212860a)
Diffstat (limited to 'crypto/aes/asm')
| -rw-r--r-- | crypto/aes/asm/aes-armv4.pl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/aes/asm/aes-armv4.pl b/crypto/aes/asm/aes-armv4.pl index a5d97ce053..4f8917089f 100644 --- a/crypto/aes/asm/aes-armv4.pl +++ b/crypto/aes/asm/aes-armv4.pl @@ -715,8 +715,8 @@ _armv4_AES_set_encrypt_key: .Ldone: mov r0,#0 ldmia sp!,{r4-r12,lr} .Labrt: -#if defined(__thumb2__) && __ARM_ARCH__>=7 - .short 0x4770 @ bx lr in Thumb2 encoding +#if __ARM_ARCH__>=5 + ret @ bx lr #else tst lr,#1 moveq pc,lr @ be binary compatible with V4, yet @@ -1203,6 +1203,7 @@ _armv4_AES_decrypt: ___ $code =~ s/\bbx\s+lr\b/.word\t0xe12fff1e/gm; # make it possible to compile with -march=armv4 +$code =~ s/\bret\b/bx\tlr/gm; open SELF,$0; while(<SELF>) { |