aesni-x86_64.pl: make ECB subroutine Windows ABI compliant.
RT: 3553 Reviewed-by: Emilia Kasper <emilia@openssl.org>
This commit is contained in:
parent
fb0e87fb67
commit
69d5747f90
@ -584,6 +584,16 @@ $code.=<<___;
|
|||||||
.type aesni_ecb_encrypt,\@function,5
|
.type aesni_ecb_encrypt,\@function,5
|
||||||
.align 16
|
.align 16
|
||||||
aesni_ecb_encrypt:
|
aesni_ecb_encrypt:
|
||||||
|
___
|
||||||
|
$code.=<<___ if ($win64);
|
||||||
|
lea -0x58(%rsp),%rsp
|
||||||
|
movaps %xmm6,(%rsp)
|
||||||
|
movaps %xmm7,0x10(%rsp)
|
||||||
|
movaps %xmm8,0x20(%rsp)
|
||||||
|
movaps %xmm9,0x30(%rsp)
|
||||||
|
.Lecb_enc_body:
|
||||||
|
___
|
||||||
|
$code.=<<___;
|
||||||
and \$-16,$len
|
and \$-16,$len
|
||||||
jz .Lecb_ret
|
jz .Lecb_ret
|
||||||
|
|
||||||
@ -862,6 +872,16 @@ $code.=<<___;
|
|||||||
movups $inout5,0x50($out)
|
movups $inout5,0x50($out)
|
||||||
|
|
||||||
.Lecb_ret:
|
.Lecb_ret:
|
||||||
|
___
|
||||||
|
$code.=<<___ if ($win64);
|
||||||
|
movaps (%rsp),%xmm6
|
||||||
|
movaps 0x10(%rsp),%xmm7
|
||||||
|
movaps 0x20(%rsp),%xmm8
|
||||||
|
movaps 0x30(%rsp),%xmm9
|
||||||
|
lea 0x58(%rsp),%rsp
|
||||||
|
.Lecb_enc_ret:
|
||||||
|
___
|
||||||
|
$code.=<<___;
|
||||||
ret
|
ret
|
||||||
.size aesni_ecb_encrypt,.-aesni_ecb_encrypt
|
.size aesni_ecb_encrypt,.-aesni_ecb_encrypt
|
||||||
___
|
___
|
||||||
@ -3225,28 +3245,9 @@ $code.=<<___;
|
|||||||
.extern __imp_RtlVirtualUnwind
|
.extern __imp_RtlVirtualUnwind
|
||||||
___
|
___
|
||||||
$code.=<<___ if ($PREFIX eq "aesni");
|
$code.=<<___ if ($PREFIX eq "aesni");
|
||||||
.type ecb_se_handler,\@abi-omnipotent
|
.type ecb_ccm64_se_handler,\@abi-omnipotent
|
||||||
.align 16
|
.align 16
|
||||||
ecb_se_handler:
|
ecb_ccm64_se_handler:
|
||||||
push %rsi
|
|
||||||
push %rdi
|
|
||||||
push %rbx
|
|
||||||
push %rbp
|
|
||||||
push %r12
|
|
||||||
push %r13
|
|
||||||
push %r14
|
|
||||||
push %r15
|
|
||||||
pushfq
|
|
||||||
sub \$64,%rsp
|
|
||||||
|
|
||||||
mov 152($context),%rax # pull context->Rsp
|
|
||||||
|
|
||||||
jmp .Lcommon_seh_tail
|
|
||||||
.size ecb_se_handler,.-ecb_se_handler
|
|
||||||
|
|
||||||
.type ccm64_se_handler,\@abi-omnipotent
|
|
||||||
.align 16
|
|
||||||
ccm64_se_handler:
|
|
||||||
push %rsi
|
push %rsi
|
||||||
push %rdi
|
push %rdi
|
||||||
push %rbx
|
push %rbx
|
||||||
@ -3283,7 +3284,7 @@ ccm64_se_handler:
|
|||||||
lea 0x58(%rax),%rax # adjust stack pointer
|
lea 0x58(%rax),%rax # adjust stack pointer
|
||||||
|
|
||||||
jmp .Lcommon_seh_tail
|
jmp .Lcommon_seh_tail
|
||||||
.size ccm64_se_handler,.-ccm64_se_handler
|
.size ecb_ccm64_se_handler,.-ecb_ccm64_se_handler
|
||||||
|
|
||||||
.type ctr_xts_se_handler,\@abi-omnipotent
|
.type ctr_xts_se_handler,\@abi-omnipotent
|
||||||
.align 16
|
.align 16
|
||||||
@ -3457,14 +3458,15 @@ ___
|
|||||||
$code.=<<___ if ($PREFIX eq "aesni");
|
$code.=<<___ if ($PREFIX eq "aesni");
|
||||||
.LSEH_info_ecb:
|
.LSEH_info_ecb:
|
||||||
.byte 9,0,0,0
|
.byte 9,0,0,0
|
||||||
.rva ecb_se_handler
|
.rva ecb_ccm64_se_handler
|
||||||
|
.rva .Lecb_enc_body,.Lecb_enc_ret # HandlerData[]
|
||||||
.LSEH_info_ccm64_enc:
|
.LSEH_info_ccm64_enc:
|
||||||
.byte 9,0,0,0
|
.byte 9,0,0,0
|
||||||
.rva ccm64_se_handler
|
.rva ecb_ccm64_se_handler
|
||||||
.rva .Lccm64_enc_body,.Lccm64_enc_ret # HandlerData[]
|
.rva .Lccm64_enc_body,.Lccm64_enc_ret # HandlerData[]
|
||||||
.LSEH_info_ccm64_dec:
|
.LSEH_info_ccm64_dec:
|
||||||
.byte 9,0,0,0
|
.byte 9,0,0,0
|
||||||
.rva ccm64_se_handler
|
.rva ecb_ccm64_se_handler
|
||||||
.rva .Lccm64_dec_body,.Lccm64_dec_ret # HandlerData[]
|
.rva .Lccm64_dec_body,.Lccm64_dec_ret # HandlerData[]
|
||||||
.LSEH_info_ctr32:
|
.LSEH_info_ctr32:
|
||||||
.byte 9,0,0,0
|
.byte 9,0,0,0
|
||||||
|
Loading…
x
Reference in New Issue
Block a user