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

[Kurt Roeckx]

Author: kroeckx
Date: 2013-03-10 20:56:22 +0000 (Sun, 10 Mar 2013)
New Revision: 595

Added:
   openssl/trunk/debian/patches/cpuid.patch
Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/patches/series
Log:
Make cpuid work on cpu's that don't set ecx (Closes: #699692)


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2013-02-24 10:08:26 UTC (rev 594)
+++ openssl/trunk/debian/changelog	2013-03-10 20:56:22 UTC (rev 595)
@@ -1,8 +1,9 @@
 openssl (1.0.1e-2) unstable; urgency=low
 
   * Bump shlibs.  It's needed for the udeb.
+  * Make cpuid work on cpu's that don't set ecx (Closes: #699692)
 
- -- Kurt Roeckx <kurt at roeckx.be>  Sun, 24 Feb 2013 11:05:55 +0100
+ -- Kurt Roeckx <kurt at roeckx.be>  Sun, 10 Mar 2013 21:55:08 +0100
 
 openssl (1.0.1e-1) unstable; urgency=high
 

Added: openssl/trunk/debian/patches/cpuid.patch
===================================================================
--- openssl/trunk/debian/patches/cpuid.patch	                        (rev 0)
+++ openssl/trunk/debian/patches/cpuid.patch	2013-03-10 20:56:22 UTC (rev 595)
@@ -0,0 +1,27 @@
+From: Andy Polyakov <appro at openssl.org>
+Date: Mon, 4 Mar 2013 19:05:04 +0000 (+0100)
+Subject: x86cpuid.pl: make it work with older CPUs.
+Origin: upstream: http://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=5702e965d759dde8a098d8108660721ba2b93a7d
+Bug-Debian: http://bugs.debian.org/699692
+Bug: http://rt.openssl.org/Ticket/Display.html?id=3005&user=guest&pass=guest
+
+diff --git a/crypto/x86cpuid.pl b/crypto/x86cpuid.pl
+index 3b6c469..e8a7518 100644
+--- a/crypto/x86cpuid.pl
++++ b/crypto/x86cpuid.pl
+@@ -69,6 +69,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+ 	&inc	("esi");		# number of cores
+ 
+ 	&mov	("eax",1);
++	&xor	("ecx","ecx");
+ 	&cpuid	();
+ 	&bt	("edx",28);
+ 	&jnc	(&label("generic"));
+@@ -102,6 +103,7 @@ for (@ARGV) { $sse2=1 if (/-DOPENSSL_IA32_SSE2/); }
+ 
+ &set_label("nocacheinfo");
+ 	&mov	("eax",1);
++	&xor	("ecx","ecx");
+ 	&cpuid	();
+ 	&and	("edx",0xbfefffff);	# force reserved bits #20, #30 to 0
+ 	&cmp	("ebp",0);

Modified: openssl/trunk/debian/patches/series
===================================================================
--- openssl/trunk/debian/patches/series	2013-02-24 10:08:26 UTC (rev 594)
+++ openssl/trunk/debian/patches/series	2013-03-10 20:56:22 UTC (rev 595)
@@ -32,3 +32,4 @@
 #padlock_conf.patch
 default_bits.patch
 ssltest_no_sslv2.patch
+cpuid.patch