From: Andy Polyakov <appro@openssl.org>
Date: Mon, 6 Jun 2011 19:58:21 +0000 (+0000)
Subject: rc4_skey.c [0.9.8]: at some point rc4_skey and x86[_64]cpuid were modified
X-Git-Tag: OpenSSL_0_9_8s~50
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8655de423dc3dfa54e20df930a5204b132edbaa9;p=oweals%2Fopenssl.git

rc4_skey.c [0.9.8]: at some point rc4_skey and x86[_64]cpuid were modified
to examine bit#20 on x86[_64], but it was erroneously reverted to bit#28
in 2008 in process of FIPS integration.
---

diff --git a/crypto/rc4/rc4_skey.c b/crypto/rc4/rc4_skey.c
index 4478d1a4b3..d1dc912b24 100644
--- a/crypto/rc4/rc4_skey.c
+++ b/crypto/rc4/rc4_skey.c
@@ -138,9 +138,9 @@ void RC4_set_key(RC4_KEY *key, int len, const unsigned char *data)
 		 */
 #ifdef OPENSSL_FIPS
 		unsigned long *ia32cap_ptr = OPENSSL_ia32cap_loc();
-		if (ia32cap_ptr && (*ia32cap_ptr & (1<<28))) {
+		if (ia32cap_ptr && (*ia32cap_ptr & (1<<20))) {
 #else
-		if (OPENSSL_ia32cap_P & (1<<28)) {
+		if (OPENSSL_ia32cap_P & (1<<20)) {
 #endif
 			unsigned char *cp=(unsigned char *)d;