Rename des_SPtrans to DES_SPtrans to differentiate from libdes and avoid certain...

[openssl.git] / crypto / des / asm / des686.pl

diff --git a/crypto/des/asm/des686.pl b/crypto/des/asm/des686.pl
index 77dc5b51cdf97e65208717a42409e8dacbad8a29..d3ad5d5edd5f0507b18c1eabad66c274f1879d38 100644 (file)
--- a/crypto/des/asm/des686.pl
+++ b/crypto/des/asm/des686.pl
@@ -46,19 +46,19 @@ EOF
 $L="edi";
 $R="esi";
 
-&des_encrypt("des_encrypt",1);
-&des_encrypt("des_encrypt2",0);
+&DES_encrypt("DES_encrypt1",1);
+&DES_encrypt("DES_encrypt2",0);
 
-&des_encrypt3("des_encrypt3",1);
-&des_encrypt3("des_decrypt3",0);
+&DES_encrypt3("DES_encrypt3",1);
+&DES_encrypt3("DES_decrypt3",0);
 
 &file_end();
 
-sub des_encrypt
+sub DES_encrypt
        {
        local($name,$do_ip)=@_;
 
-       &function_begin($name,"EXTRN   _des_SPtrans:DWORD");
+       &function_begin($name,"EXTRN   _DES_SPtrans:DWORD");
 
        &comment("");
        &comment("Load the 2 words");
@@ -94,11 +94,11 @@ sub des_encrypt
                {
                &comment("");
                &comment("Round $i");
-               &D_ENCRYPT($L,$R,$i*2,"ebp","des_SPtrans","ecx","edx","eax","ebx");
+               &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
 
                &comment("");
                &comment("Round ".sprintf("%d",$i+1));
-               &D_ENCRYPT($R,$L,($i+1)*2,"ebp","des_SPtrans","ecx","edx","eax","ebx");
+               &D_ENCRYPT($R,$L,($i+1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
                }
        &jmp(&label("end"));
 
@@ -108,10 +108,10 @@ sub des_encrypt
                {
                &comment("");
                &comment("Round $i");
-               &D_ENCRYPT($L,$R,$i*2,"ebp","des_SPtrans","ecx","edx","eax","ebx");
+               &D_ENCRYPT($L,$R,$i*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
                &comment("");
                &comment("Round ".sprintf("%d",$i-1));
-               &D_ENCRYPT($R,$L,($i-1)*2,"ebp","des_SPtrans","ecx","edx","eax","ebx");
+               &D_ENCRYPT($R,$L,($i-1)*2,"ebp","DES_SPtrans","ecx","edx","eax","ebx");
                }
 
        &set_label("end");