diff options
| author | Andy Polyakov <appro@openssl.org> | 2011-12-15 22:20:26 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2011-12-15 22:20:26 +0000 |
| commit | 700384be8ef3177b1dc499299c388a4db97c671f (patch) | |
| tree | 724a81ae773af0ceacf9fa56021f4fb74f62e6ef /crypto/aes | |
| parent | b8a22c40e019c406f1023c0383bf8425c3f1d890 (diff) | |
vpaes-x86.pl: revert previous commit and solve the problem through x86masm.pl [from HEAD].
PR: 2657
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/vpaes-x86.pl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/aes/asm/vpaes-x86.pl b/crypto/aes/asm/vpaes-x86.pl index 30446e60db..84a6f6d336 100644 --- 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 ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point")); + &lea ($const,&DWP(&label("_vpaes_consts")."+0x30-".&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; - &mov ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point")); + &lea ($const,&DWP(&label("_vpaes_consts")."+0x30-".&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"); - &mov ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point")); + &lea ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point"))); &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"); - &mov ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point")); + &lea ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point"))); &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 ($const,&label("_vpaes_consts")."+0x30-".&label("pic_point")); + &lea ($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point"))); &call ("_vpaes_preheat"); &set_label("pic_point"); &cmp ($magic,0); |