diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-04-19 20:43:02 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-04-19 20:43:02 +0000 |
| commit | 7fc6d35be0b668269c7d36fbf472dbf2e0e2beeb (patch) | |
| tree | 89af37a8968ea07a197d26d23e8591ac5f06437f /crypto/evp | |
| parent | e7d2a37158eb2d4b66af983741eb66926e9941ce (diff) | |
e_rc4_hmac_md5.c: last commit was inappropriate for non-x86[_64] platforms
[from HEAD].
PR: 2792
Diffstat (limited to 'crypto/evp')
| -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 |