vpaes-x86.pl: portability fix.

PR: 2657

diff --git a/crypto/aes/asm/vpaes-x86.pl b/crypto/aes/asm/vpaes-x86.pl
index 84a6f6d336ca421b9e22de2515b5dbef6e6f45db..30446e60db3fa16880494296a8af75ab2fa331cd 100644 (file)
--- a/crypto/aes/asm/vpaes-x86.pl
+++ b/crypto/aes/asm/vpaes-x86.pl
@@ -762,7 +762,7 @@ $k_dsbo=0x2c0;              # decryption sbox final output
        &mov    ($magic,0x30);
        &mov    ($out,0);
 
        &mov    ($magic,0x30);
        &mov    ($out,0);
 

-       &lea    ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));
+       &mov    ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point"));

        &call   ("_vpaes_schedule_core");
 &set_label("pic_point");
 
        &call   ("_vpaes_schedule_core");
 &set_label("pic_point");
 


@@ -792,7 +792,7 @@ $k_dsbo=0x2c0;              # decryption sbox final output
        &and    ($magic,32);
        &xor    ($magic,32);                    # nbist==192?0:32;
 
        &and    ($magic,32);
        &xor    ($magic,32);                    # nbist==192?0:32;
 

-       &lea    ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));
+       &mov    ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point"));

        &call   ("_vpaes_schedule_core");
 &set_label("pic_point");
 
        &call   ("_vpaes_schedule_core");
 &set_label("pic_point");
 


@@ -801,7 +801,7 @@ $k_dsbo=0x2c0;              # decryption sbox final output
 &function_end("${PREFIX}_set_decrypt_key");
 
 &function_begin("${PREFIX}_encrypt");
 &function_end("${PREFIX}_set_decrypt_key");
 
 &function_begin("${PREFIX}_encrypt");

-       &lea    ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));
+       &mov    ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point"));

        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &mov    ($inp,&wparam(0));              # inp
        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &mov    ($inp,&wparam(0));              # inp


@@ -820,7 +820,7 @@ $k_dsbo=0x2c0;              # decryption sbox final output
 &function_end("${PREFIX}_encrypt");
 
 &function_begin("${PREFIX}_decrypt");
 &function_end("${PREFIX}_encrypt");
 
 &function_begin("${PREFIX}_decrypt");

-       &lea    ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));
+       &mov    ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point"));

        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &mov    ($inp,&wparam(0));              # inp
        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &mov    ($inp,&wparam(0));              # inp


@@ -858,7 +858,7 @@ $k_dsbo=0x2c0;              # decryption sbox final output
        &mov    (&DWP(8,"esp"),$const);         # save ivp
        &mov    ($out,$round);                  # $out works as $len
 
        &mov    (&DWP(8,"esp"),$const);         # save ivp
        &mov    ($out,$round);                  # $out works as $len
 

-       &lea    ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));
+       &mov    ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point"));

        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &cmp    ($magic,0);
        &call   ("_vpaes_preheat");
 &set_label("pic_point");
        &cmp    ($magic,0);