[rpms/openssl] rebase_40beta: fix misdetection of RDRAND support on Cyrix CPUS (from upstream) (#1022346)

[rpms/openssl] rebase_40beta: fix misdetection of RDRAND support on Cyrix CPUS (from upstream) (#1022346)

[Tomas Mraz]

A new commit has been pushed.

Repo   : rpms/openssl
Branch : rebase_40beta
Commit : 5714047e75ab36f53e99033ac345fb6d27012298
Author : Tomas Mraz <tmraz@fedoraproject.org>
Date   : 2013-10-29T16:24:08+01:00
Stats  : +24/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/openssl/c/5714047e75ab36f53e99033ac345fb6d27012298?branch=rebase_40beta

Log:
fix misdetection of RDRAND support on Cyrix CPUS (from upstream) (#1022346)

---
diff --git a/openssl-1.0.1e-backports.patch b/openssl-1.0.1e-backports.patch
index 5abe884..abe3017 100644
--- a/openssl-1.0.1e-backports.patch
+++ b/openssl-1.0.1e-backports.patch
@@ -323,3 +323,23 @@ diff -up openssl-1.0.1e/ssl/ssl_lib.c.backports openssl-1.0.1e/ssl/ssl_lib.c
  		return(s->cert->key->x509);
  	else
  		return(NULL);
+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);

diff --git a/openssl.spec b/openssl.spec
index a843a76..7e07179 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -21,7 +21,7 @@
 Summary: Utilities from the general purpose cryptography library with TLS implementation
 Name: openssl
 Version: 1.0.1e
-Release: 29%{?dist}
+Release: 30%{?dist}
 Epoch: 1
 # We have to remove certain patented algorithms from the openssl source
 # tarball with the hobble-openssl script which is included below.
@@ -456,6 +456,9 @@ rm -rf $RPM_BUILD_ROOT/%{_libdir}/fipscanister.*
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Oct 29 2013 Tomáš Mráz <tmraz@redhat.com> 1.0.1e-30
+- fix misdetection of RDRAND support on Cyrix CPUS (from upstream) (#1022346)
+
 * Thu Oct 24 2013 Tomáš Mráz <tmraz@redhat.com> 1.0.1e-29
 - do not advertise ECC curves we do not support (#1022493)