Commit 45b364dd authored Dec 27, 2008 by Andy Polyakov

Sync aes/asm with stable branch.

parent 8887e81b

crypto/aes/asm/aes-586.pl

+2 −1

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

	&align (4);		&align (4);
	&set_label("enc_tail");		&set_label("enc_tail");
	&push ($key eq "edi" ? $key : ""); # push ivp		&mov ($s0,$key eq "edi" ? $key : "");
	&mov ($key,$_out); # load out		&mov ($key,$_out); # load out
			&push ($s0); # push ivp
	&mov ($s1,16);		&mov ($s1,16);
	&sub ($s1,$s2);		&sub ($s1,$s2);
	&cmp ($key,$acc); # compare with inp		&cmp ($key,$acc); # compare with inp

crypto/aes/asm/aes-x86_64.pl

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1198,6 +1198,8 @@ AES_cbc_encrypt:
	ret		ret
	.align 4		.align 4
	.Lcbc_enc_tail:		.Lcbc_enc_tail:
			mov %rax,%r11
			mov %rcx,%r12
	mov %r10,%rcx		mov %r10,%rcx
	mov $inp,%rsi		mov $inp,%rsi
	mov $out,%rdi		mov $out,%rdi
	@@ -1208,6 +1210,8 @@ AES_cbc_encrypt:
	.long 0xF689AAF3 # rep stosb		.long 0xF689AAF3 # rep stosb
	mov $out,$inp # this is not a mistake!		mov $out,$inp # this is not a mistake!
	movq \$16,$_len # len=16		movq \$16,$_len # len=16
			mov %r11,%rax
			mov %r12,%rcx
	jmp .Lcbc_enc_loop # one more spin...		jmp .Lcbc_enc_loop # one more spin...
	#----------------------------- DECRYPT -----------------------------#		#----------------------------- DECRYPT -----------------------------#
	.align 16		.align 16