[Pkg-openssl-changes] r555 - in openssl/trunk/debian: . patches

[Kurt Roeckx]

Author: kroeckx
Date: 2012-03-31 16:33:52 +0000 (Sat, 31 Mar 2012)
New Revision: 555

Added:
   openssl/trunk/debian/patches/vpaes-x86.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Fix crash in vpaes (Closes: #665836)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2012-03-19 19:05:15 UTC (rev 554)
+++ openssl/trunk/debian/changelog	2012-03-31 16:33:52 UTC (rev 555)
@@ -1,3 +1,9 @@
+openssl (1.0.1-3) unstable; urgency=high
+
+  * Fix crash in vpaes (Closes: #665836)
+
+ -- Kurt Roeckx <kurt at roeckx.be>  Sat, 31 Mar 2012 18:28:50 +0200
+
 openssl (1.0.1-2) unstable; urgency=low
 
   * Properly quote the new cflags in Configure

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2012-03-19 19:05:15 UTC (rev 554)
+++ openssl/trunk/debian/patches/series	2012-03-31 16:33:52 UTC (rev 555)
@@ -30,3 +30,4 @@
 block_digicert_malaysia.patch
 c_rehash-multi.patch
 no_ssl2.patch
+vpaes-x86.patch

Added: openssl/trunk/debian/patches/vpaes-x86.patch
===================================================================
--- openssl/trunk/debian/patches/vpaes-x86.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/vpaes-x86.patch	2012-03-31 16:33:52 UTC (rev 555)
@@ -0,0 +1,15 @@
+Index: crypto/aes/asm/vpaes-x86.pl
+===================================================================
+RCS file: /e/openssl/cvs/openssl/crypto/aes/asm/vpaes-x86.pl,v
+retrieving revision 1.7
+diff -u -w -r1.7 vpaes-x86.pl
+--- a/crypto/aes/asm/vpaes-x86.pl	15 Dec 2011 22:20:04 -0000	1.7
++++ a/crypto/aes/asm/vpaes-x86.pl	31 Mar 2012 10:06:51 -0000
+@@ -856,6 +856,7 @@
+ 	&sub	($round,16);
+ 	&mov	(&DWP(4,"esp"),$key)		# save key
+ 	&mov	(&DWP(8,"esp"),$const);		# save ivp
++	&jc	(&label("cbc_done"));
+ 	&mov	($out,$round);			# $out works as $len
+ 
+ 	&lea	($const,&DWP(&label("_vpaes_consts")."+0x30-".&label("pic_point")));