rc4-x86[_64].pl: back-sync with original 1.0.1.

diff --git a/crypto/rc4/asm/rc4-586.pl b/crypto/rc4/asm/rc4-586.pl
index 84f1a798cb8eca08c4314589966a01e1847334b0..5c9ac6ad286e21dd3e53436165dac21ea49a1c92 100644 (file)
--- a/crypto/rc4/asm/rc4-586.pl
+++ b/crypto/rc4/asm/rc4-586.pl
@@ -300,7 +300,7 @@ $ido="ecx";
 $idx="edx";
 
 # void RC4_set_key(RC4_KEY *key,int len,const unsigned char *data);
 $idx="edx";
 
 # void RC4_set_key(RC4_KEY *key,int len,const unsigned char *data);

-&function_begin("RC4_set_key");
+&function_begin("private_RC4_set_key");

        &mov    ($out,&wparam(0));              # load key
        &mov    ($idi,&wparam(1));              # load len
        &mov    ($inp,&wparam(2));              # load data
        &mov    ($out,&wparam(0));              # load key
        &mov    ($idi,&wparam(1));              # load len
        &mov    ($inp,&wparam(2));              # load data


@@ -378,7 +378,7 @@ $idx="edx";
        &xor    ("eax","eax");
        &mov    (&DWP(-8,$out),"eax");          # key->x=0;
        &mov    (&DWP(-4,$out),"eax");          # key->y=0;
        &xor    ("eax","eax");
        &mov    (&DWP(-8,$out),"eax");          # key->x=0;
        &mov    (&DWP(-4,$out),"eax");          # key->y=0;

-&function_end("RC4_set_key");
+&function_end("private_RC4_set_key");

 
 # const char *RC4_options(void);
 &function_begin_B("RC4_options");
 
 # const char *RC4_options(void);
 &function_begin_B("RC4_options");

diff --git a/crypto/rc4/asm/rc4-x86_64.pl b/crypto/rc4/asm/rc4-x86_64.pl
index e18e8a00084d4608d94530660d78f413d5f29fe2..0ca0fafe0364a8de9064ba1591776e99bec57f95 100755 (executable)
--- a/crypto/rc4/asm/rc4-x86_64.pl
+++ b/crypto/rc4/asm/rc4-x86_64.pl
@@ -429,10 +429,10 @@ $idx="%r8";
 $ido="%r9";
 
 $code.=<<___;
 $ido="%r9";
 
 $code.=<<___;

-.globl RC4_set_key
-.type  RC4_set_key,\@function,3
+.globl private_RC4_set_key
+.type  private_RC4_set_key,\@function,3

 .align 16
 .align 16

-RC4_set_key:
+private_RC4_set_key:

        lea     8($dat),$dat
        lea     ($inp,$len),$inp
        neg     $len
        lea     8($dat),$dat
        lea     ($inp,$len),$inp
        neg     $len


@@ -499,7 +499,7 @@ RC4_set_key:
        mov     %eax,-8($dat)
        mov     %eax,-4($dat)
        ret
        mov     %eax,-8($dat)
        mov     %eax,-4($dat)
        ret

-.size  RC4_set_key,.-RC4_set_key
+.size  private_RC4_set_key,.-private_RC4_set_key

 
 .globl RC4_options
 .type  RC4_options,\@abi-omnipotent
 
 .globl RC4_options
 .type  RC4_options,\@abi-omnipotent