projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
md5-ia64.S: fix assembler warning [from HEAD].
[oweals/openssl.git]
/
crypto
/
md5
/
asm
/
md5-586.pl
diff --git
a/crypto/md5/asm/md5-586.pl
b/crypto/md5/asm/md5-586.pl
index 0249e100e1d3683c66fd3cd2e72fb6bed5c7406d..6cb66bb49991500f88bdfe0c79b81ffbd137d7ce 100644
(file)
--- a/
crypto/md5/asm/md5-586.pl
+++ b/
crypto/md5/asm/md5-586.pl
@@
-7,7
+7,8
@@
$normal=0;
$normal=0;
-push(@INC,"perlasm","../../perlasm");
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+push(@INC,"${dir}","${dir}../../perlasm");
require "x86asm.pl";
&asm_init($ARGV[0],$0);
require "x86asm.pl";
&asm_init($ARGV[0],$0);
@@
-29,7
+30,7
@@
$X="esi";
0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9, # R3
);
0, 7, 14, 5, 12, 3, 10, 1, 8, 15, 6, 13, 4, 11, 2, 9, # R3
);
-&md5_block("md5_block_
x86
");
+&md5_block("md5_block_
asm_data_order
");
&asm_finish();
sub Np
&asm_finish();
sub Np
@@
-183,6
+184,7
@@
sub md5_block
&mov($X, &wparam(1)); # esi
&mov($C, &wparam(2));
&push("ebp");
&mov($X, &wparam(1)); # esi
&mov($C, &wparam(2));
&push("ebp");
+ &shl($C, 6);
&push("ebx");
&add($C, $X); # offset we end at
&sub($C, 64);
&push("ebx");
&add($C, $X); # offset we end at
&sub($C, 64);
@@
-292,7
+294,7
@@
sub md5_block
&mov(&DWP(12,$tmp2,"",0),$D);
&cmp($tmp1,$X) unless $normal; # check count
&mov(&DWP(12,$tmp2,"",0),$D);
&cmp($tmp1,$X) unless $normal; # check count
- &j
g
e(&label("start")) unless $normal;
+ &j
a
e(&label("start")) unless $normal;
&pop("eax"); # pop the temp variable off the stack
&pop("ebx");
&pop("eax"); # pop the temp variable off the stack
&pop("ebx");