Commit 2a76c688 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Backport aes-x86_64.pl update from HEAD and revisit same code in aes-586.pl. 

PR: 1801
parent 1b00f4bc

crypto/aes/asm/aes-586.pl

+2 −1
Original line number Diff line number Diff line
@@ -955,8 +955,9 @@ my $mark=&DWP(60+240,"esp"); #copy of aes_key->rounds 


    &align	(4);

    &set_label("enc_tail");

	&push	($key eq "edi" ? $key : "");	# push ivp

	&mov	($s0,$key eq "edi" ? $key : "");

	&mov	($key,$_out);			# load out

	&push	($s0);				# push ivp

	&mov	($s1,16);

	&sub	($s1,$s2);

	&cmp	($key,$acc);			# compare with inp

crypto/aes/asm/aes-x86_64.pl

+0 −3
Original line number Diff line number Diff line
@@ -1198,13 +1198,10 @@ AES_cbc_encrypt: 
	ret

.align	4

.Lcbc_enc_tail:

	cmp	$inp,$out

	je	.Lcbc_enc_in_place

	mov	%r10,%rcx

	mov	$inp,%rsi

	mov	$out,%rdi

	.long	0xF689A4F3		# rep movsb

.Lcbc_enc_in_place:

	mov	\$16,%rcx		# zero tail

	sub	%r10,%rcx

	xor	%rax,%rax