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

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

diff --git a/crypto/des/asm/crypt586.pl b/crypto/des/asm/crypt586.pl
index b310d922a1ae98d207f8f844adeed723e54dc315..3d41d82f69d35f1146351d1f77d3b5881cd9b451 100644 (file)
--- a/crypto/des/asm/crypt586.pl
+++ b/crypto/des/asm/crypt586.pl
@@ -14,7 +14,7 @@ require "x86asm.pl";
 $L="edi";
 $R="esi";
 
-&external_label("des_SPtrans");
+&external_label("DES_SPtrans");
 &fcrypt_body("fcrypt_body");
 &asm_finish();
 
@@ -22,7 +22,7 @@ sub fcrypt_body
        {
        local($name,$do_ip)=@_;
 
-       &function_begin($name,"EXTRN   _des_SPtrans:DWORD");
+       &function_begin($name,"EXTRN   _DES_SPtrans:DWORD");
 
        &comment("");
        &comment("Load the 2 words");
@@ -32,18 +32,18 @@ sub fcrypt_body
        &xor(   $R,     $R);
        &mov($ks,&wparam(1));
 
-       &push(25); # add a variable
+       &push(&DWC(25)); # add a variable
 
        &set_label("start");
        for ($i=0; $i<16; $i+=2)
                {
                &comment("");
                &comment("Round $i");
-               &D_ENCRYPT($i,$L,$R,$i*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
+               &D_ENCRYPT($i,$L,$R,$i*2,$ks,"DES_SPtrans","eax","ebx","ecx","edx");
 
                &comment("");
                &comment("Round ".sprintf("%d",$i+1));
-               &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$ks,"des_SPtrans","eax","ebx","ecx","edx");
+               &D_ENCRYPT($i+1,$R,$L,($i+1)*2,$ks,"DES_SPtrans","eax","ebx","ecx","edx");
                }
         &mov("ebx",    &swtmp(0));
        &mov("eax",     $L);