projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e18136
)
e_rc4_hmac_md5.c: oops, can't use rc4_hmac_md5_cipher on legacy Intel CPUs.
author
Andy Polyakov
<appro@openssl.org>
Wed, 18 Apr 2012 14:50:28 +0000
(14:50 +0000)
committer
Andy Polyakov
<appro@openssl.org>
Wed, 18 Apr 2012 14:50:28 +0000
(14:50 +0000)
PR: 2792
crypto/evp/e_rc4_hmac_md5.c
patch
|
blob
|
history
diff --git
a/crypto/evp/e_rc4_hmac_md5.c
b/crypto/evp/e_rc4_hmac_md5.c
index 94c011000c483b2d9fca30d788e369d699f66b4c..c25b669cfe49e56d9934fc191ebabba375d79482 100644
(file)
--- 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