aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2013-12-28 12:17:08 +0100
committerAndy Polyakov <appro@openssl.org>2013-12-28 12:17:08 +0100
commit2218c296b4981af6f2639bbd7eabfb89437fe776 (patch)
treef1081af1043bea4fb5e0555c6006214dcbe616f9
parentcd30f03ac5bf2962f44bd02ae8d88245dff2f12c (diff)
downloadopenssl-2218c296b4981af6f2639bbd7eabfb89437fe776.tar.gz
ARM assembly pack: make it work with older toolchain.
-rw-r--r--crypto/bn/Makefile3
-rw-r--r--crypto/sha/asm/sha256-armv4.pl4
2 files changed, 4 insertions, 3 deletions
diff --git a/crypto/bn/Makefile b/crypto/bn/Makefile
index 5f2c2f4d13..b62b676325 100644
--- a/crypto/bn/Makefile
+++ b/crypto/bn/Makefile
@@ -141,9 +141,10 @@ alpha-mont.s: asm/alpha-mont.pl
$(CC) -E $$preproc > $@ && rm $$preproc)
# GNU make "catch all"
-%-mont.s: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@
+%-mont.S: asm/%-mont.pl; $(PERL) $< $(PERLASM_SCHEME) $@
%-gf2m.S: asm/%-gf2m.pl; $(PERL) $< $(PERLASM_SCHEME) $@
+armv4-mont.o: armv4-mont.S
armv4-gf2m.o: armv4-gf2m.S
files:
diff --git a/crypto/sha/asm/sha256-armv4.pl b/crypto/sha/asm/sha256-armv4.pl
index 2a0a98947e..672e571ed5 100644
--- a/crypto/sha/asm/sha256-armv4.pl
+++ b/crypto/sha/asm/sha256-armv4.pl
@@ -104,10 +104,10 @@ $code.=<<___;
eor $t2,$a,$b @ a^b, b^c in next round
ldr $t4,[sp,#`($i+15)%16`*4] @ from future BODY_16_xx
#endif
- eor $t0,$a,ror#$Sigma0[1]
+ eor $t0,$t0,$a,ror#$Sigma0[1]
and $t3,$t3,$t2 @ (b^c)&=(a^b)
add $d,$d,$h @ d+=h
- eor $t0,$a,ror#$Sigma0[2] @ Sigma0(a)
+ eor $t0,$t0,$a,ror#$Sigma0[2] @ Sigma0(a)
eor $t3,$t3,$b @ Maj(a,b,c)
add $h,$h,$t0 @ h+=Sigma0(a)
@ add $h,$h,$t3 @ h+=Maj(a,b,c)