From 6786f52ada04daba9733aef6a7050809bf6ce4d2 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Wed, 17 Dec 2008 14:11:30 +0000
Subject: SEGV in AES_cbc_encrypt in aes-x86_64 assembler module. PR: 1801
 Submitted by: Huang Ying

---
 crypto/aes/asm/aes-x86_64.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'crypto/aes')

diff --git a/crypto/aes/asm/aes-x86_64.pl b/crypto/aes/asm/aes-x86_64.pl
index d041507343..c2b040a84f 100755
--- a/crypto/aes/asm/aes-x86_64.pl
+++ b/crypto/aes/asm/aes-x86_64.pl
@@ -1965,19 +1965,16 @@ AES_cbc_encrypt:
 	jmp	.Lcbc_exit
 .align	4
 .Lcbc_slow_enc_tail:
-	cmp	$inp,$out
-	je	.Lcbc_slow_enc_in_place
 	mov	%r10,%rcx
 	mov	$inp,%rsi
 	mov	$out,%rdi
 	.long	0x9066A4F3		# rep movsb
-.Lcbc_slow_enc_in_place:
 	mov	\$16,%rcx		# zero tail
 	sub	%r10,%rcx
 	xor	%rax,%rax
 	.long	0x9066AAF3		# rep stosb
 	mov	$out,$inp		# this is not a mistake!
-	movq	\$16,$_len		# len=16
+	mov	\$16,%r10		# len=16
 	jmp	.Lcbc_slow_enc_loop	# one more spin...
 #--------------------------- SLOW DECRYPT ---------------------------#
 .align	16
-- 
cgit v1.2.3