diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-03-28 15:21:35 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-03-29 15:22:03 +0200 |
| commit | 51f8d095562f36cdaa6893597b5c609e943b0565 (patch) | |
| tree | 86b3afaf148c99b510d9a72d59504635e524bc66 | |
| parent | 6a919b44f745c1d764b6b0593b2a60bd8e342c67 (diff) | |
sha/asm/sha256-armv4.pl: fix compile issue in kernel
and eliminate little-endian dependency.
Reviewed-by: Rich Salz <rsalz@openssl.org>
| -rw-r--r-- | crypto/sha/asm/sha256-armv4.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl index 4fee74d832..fac0533ea6 100644 --- a/crypto/sha/asm/sha256-armv4.pl +++ b/crypto/sha/asm/sha256-armv4.pl @@ -73,7 +73,9 @@ $code.=<<___ if ($i<16); eor $t0,$e,$e,ror#`$Sigma1[1]-$Sigma1[0]` add $a,$a,$t2 @ h+=Maj(a,b,c) from the past eor $t0,$t0,$e,ror#`$Sigma1[2]-$Sigma1[0]` @ Sigma1(e) +# ifndef __ARMEB__ rev $t1,$t1 +# endif #else @ ldrb $t1,[$inp,#3] @ $i add $a,$a,$t2 @ h+=Maj(a,b,c) from the past @@ -166,6 +168,7 @@ $code=<<___; #else .syntax unified # ifdef __thumb2__ +# define adrl adr .thumb # else .code 32 @@ -460,7 +463,7 @@ sha256_block_data_order_neon: stmdb sp!,{r4-r12,lr} sub $H,sp,#16*4+16 - adr $Ktbl,K256 + adrl $Ktbl,K256 bic $H,$H,#15 @ align for 128-bit stores mov $t2,sp mov sp,$H @ alloca |