From: Andy Polyakov <appro@openssl.org>
Date: Sat, 13 Feb 2016 12:37:25 +0000 (+0100)
Subject: chacha/asm/chacha-x86[_64].pl: fix typos and logical errors.
X-Git-Tag: OpenSSL_1_1_0-pre3~12
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=29880e97104e5c88887e502a1d0ff570b646ec1b

chacha/asm/chacha-x86[_64].pl: fix typos and logical errors.

Thanks to: David Benjamin of Chromuim.

RT#4305

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/crypto/chacha/asm/chacha-x86.pl b/crypto/chacha/asm/chacha-x86.pl
index 60d604882f..e2019aa3b5 100755
--- a/crypto/chacha/asm/chacha-x86.pl
+++ b/crypto/chacha/asm/chacha-x86.pl
@@ -219,7 +219,7 @@ if ($xmm) {
 	&dec	($b);
 	&jnz	(&label("loop"));
 
-	&mov	($b,&wparam(3));		# load len
+	&mov	($b,&wparam(2));		# load len
 
 	&add	($a,0x61707865);		# accumulate key material
 	&add	($b_,&DWP(64+4*4,"esp"));
diff --git a/crypto/chacha/asm/chacha-x86_64.pl b/crypto/chacha/asm/chacha-x86_64.pl
index 41dbef51b2..1a87cf8495 100755
--- a/crypto/chacha/asm/chacha-x86_64.pl
+++ b/crypto/chacha/asm/chacha-x86_64.pl
@@ -344,8 +344,8 @@ $code.=<<___;
 .align	16
 .Ltail:
 	mov	@x[0],4*0(%rsp)
-	xor	%rbx,%rbx
 	mov	@x[1],4*1(%rsp)
+	xor	%rbx,%rbx
 	mov	@x[2],4*2(%rsp)
 	mov	@x[3],4*3(%rsp)
 	mov	@x[4],4*4(%rsp)
@@ -521,11 +521,11 @@ $code.=<<___;
 
 .Loop_tail_ssse3:
 	movzb	($inp,%rbx),%eax
-	movzb	(%rsp,%rbx),%edx
+	movzb	(%rsp,%rbx),%ecx
 	lea	1(%rbx),%rbx
-	xor	%edx,%eax
+	xor	%ecx,%eax
 	mov	%al,-1($out,%rbx)
-	inc	%rbp
+	dec	$len
 	jnz	.Loop_tail_ssse3
 
 .Ldone_ssse3: