diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-04-19 20:38:05 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-04-19 20:38:05 +0000 |
| commit | 8ea92ddd13495e63855a61dcc96963ffdf6df495 (patch) | |
| tree | c0f465ac6e6fc977b58b50f166953c45f186d363 /crypto/evp/e_rc4_hmac_md5.c | |
| parent | d9a9d10f4f8d4ed051f2488a90b012dceb7ec885 (diff) | |
e_rc4_hmac_md5.c: last commit was inappropriate for non-x86[_64] platforms.
PR: 2792
Diffstat (limited to 'crypto/evp/e_rc4_hmac_md5.c')
| -rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 3f32b2591c..649fcadd98 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -121,6 +121,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, md5_off = MD5_CBLOCK-key->md.num, blocks; unsigned int l; + extern unsigned int OPENSSL_ia32cap_P[]; #endif size_t plen = key->payload_length; @@ -132,7 +133,8 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, /* cipher has to "fall behind" */ if (rc4_off>md5_off) md5_off+=MD5_CBLOCK; - if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK)) { + if (plen>md5_off && (blocks=(plen-md5_off)/MD5_CBLOCK) && + (OPENSSL_ia32cap_P[0]&(1<<20))==0) { MD5_Update(&key->md,in,md5_off); RC4(&key->ks,rc4_off,in,out); @@ -172,7 +174,8 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, if (md5_off>rc4_off) rc4_off += 2*MD5_CBLOCK; else rc4_off += MD5_CBLOCK; - if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK)) { + if (len>rc4_off && (blocks=(len-rc4_off)/MD5_CBLOCK) && + (OPENSSL_ia32cap_P[0]&(1<<20))==0) { RC4(&key->ks,rc4_off,in,out); MD5_Update(&key->md,out,md5_off); @@ -289,8 +292,6 @@ static EVP_CIPHER r4_hmac_md5_cipher= const EVP_CIPHER *EVP_rc4_hmac_md5(void) { - extern unsigned int OPENSSL_ia32cap_P[]; - /* RC4_CHAR flag ------------vvvvv */ - return(OPENSSL_ia32cap_P[0]&(1<<20) ? NULL : &r4_hmac_md5_cipher); + return(&r4_hmac_md5_cipher); } #endif |