rc4-x86_64 portability fix.

[openssl.git] / crypto / rc4 / asm / rc4-x86_64.pl

diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index 36a9429ef73dfa664124b15762fd10dc2e0c2d16..c2af3109a069eae24fa3a13fa57e9992bbc99f44 100755 (executable)
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -2,8 +2,9 @@
 #
 # ====================================================================
 # Written by Andy Polyakov <appro@fy.chalmers.se> for the OpenSSL
-# project. Rights for redistribution and usage in source and binary
-# forms are granted according to the OpenSSL license.
+# project. The module is, however, dual licensed under OpenSSL and
+# CRYPTOGAMS licenses depending on where you obtain it. For further
+# details see http://www.openssl.org/~appro/cryptogams/.
 # ====================================================================
 #
 # 2.22x RC4 tune-up:-) It should be noted though that my hand [as in
@@ -58,7 +59,13 @@
 # this CPU.
 
 $output=shift;
-open STDOUT,"| $^X ../perlasm/x86_64-xlate.pl $output";
+
+$0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
+( $xlate="${dir}x86_64-xlate.pl" and -f $xlate ) or
+( $xlate="${dir}../../perlasm/x86_64-xlate.pl" and -f $xlate) or
+die "can't locate x86_64-xlate.pl";
+
+open STDOUT,"| $^X $xlate $output";
 
 $dat="%rdi";       # arg1
 $len="%rsi";       # arg2
@@ -160,7 +167,7 @@ $code.=<<___;
        movzb   ($dat,$XX[0]),$TX[0]#d
        test    \$-8,$len
        jz      .Lcloop1
-       cmp     \$0,260($dat)
+       cmpl    \$0,260($dat)
        jnz     .Lcloop1
        push    %rbx
        jmp     .Lcloop8
@@ -345,7 +352,7 @@ RC4_options:
 .asciz "rc4(8x,int)"
 .asciz "rc4(8x,char)"
 .asciz "rc4(1x,char)"
-.asciz "RC4 for x86_64, OpenSSL project"
+.asciz "RC4 for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
 .align 64
 .size  RC4_options,.-RC4_options
 ___