generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e_rc4_hmac_md5.c: last commit was inappropriate for non-x86[_64] platforms

Browse Source 
[from HEAD].
PR: 2792
This commit is contained in:
Andy Polyakov 2012-04-19 20:42:24 +00:00
parent d6ef8165bb
commit c3cb563d87
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
crypto/evp/e_rc4_hmac_md5.c
View File

@ -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