From: Andy Polyakov <appro@openssl.org>
Date: Wed, 18 Apr 2012 14:50:28 +0000 (+0000)
Subject: e_rc4_hmac_md5.c: oops, can't use rc4_hmac_md5_cipher on legacy Intel CPUs.
X-Git-Tag: master-post-reformat~1858
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e36f6b9cfa8c4653b983163687d15f1aacb25e81;p=oweals%2Fopenssl.git

e_rc4_hmac_md5.c: oops, can't use rc4_hmac_md5_cipher on legacy Intel CPUs.

PR: 2792
---

diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 94c011000c..c25b669cfe 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -287,6 +287,8 @@ static EVP_CIPHER r4_hmac_md5_cipher=
 
 const EVP_CIPHER *EVP_rc4_hmac_md5(void)
 	{
-	return(&r4_hmac_md5_cipher);
+	extern unsigned int OPENSSL_ia32cap_P[];
+	/* RC4_CHAR flag ------------vvvvv */
+	return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher);
 	}
 #endif