e_rc4_hmac_md5.c: update from HEAD, fixes crash 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 eaa7a5312c71641976922be8a1b818d4c577fbad..3f32b2591c0e60a4257010603b30c34a9e29c53d 100644 (file)
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -75,6 +75,8 @@ typedef struct
     size_t             payload_length;
     } EVP_RC4_HMAC_MD5;
 
+#define NO_PAYLOAD_LENGTH      ((size_t)-1)
+
 void rc4_md5_enc (RC4_KEY *key, const void *in0, void *out,
                MD5_CTX *ctx,const void *inp,size_t blocks);
 
@@ -93,7 +95,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
        key->tail = key->head;
        key->md   = key->head;
 
-       key->payload_length = 0;
+       key->payload_length = NO_PAYLOAD_LENGTH;
 
        return 1;
        }
@@ -101,8 +103,7 @@ static int rc4_hmac_md5_init_key(EVP_CIPHER_CTX *ctx,
 #if    !defined(OPENSSL_NO_ASM) &&     ( \
        defined(__x86_64)       || defined(__x86_64__)  || \
        defined(_M_AMD64)       || defined(_M_X64)      || \
-       defined(__INTEL__)              ) && \
-       !(defined(__APPLE__) && defined(__MACH__))
+       defined(__INTEL__)              )
 #define        STITCHED_CALL
 #endif
 
@@ -123,10 +124,10 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 #endif
        size_t  plen = key->payload_length;
 
-       if (plen && len!=(plen+MD5_DIGEST_LENGTH)) return 0;
+       if (plen!=NO_PAYLOAD_LENGTH && len!=(plen+MD5_DIGEST_LENGTH)) return 0;
 
        if (ctx->encrypt) {
-               if (plen==0) plen = len;
+               if (plen==NO_PAYLOAD_LENGTH) plen = len;
 #if defined(STITCHED_CALL)
                /* cipher has to "fall behind" */
                if (rc4_off>md5_off) md5_off+=MD5_CBLOCK;
@@ -191,7 +192,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 #endif
                /* decrypt HMAC at once */
                RC4(&key->ks,len-rc4_off,in+rc4_off,out+rc4_off);
-               if (plen) {     /* "TLS" mode of operation */
+               if (plen!=NO_PAYLOAD_LENGTH) {  /* "TLS" mode of operation */
                        MD5_Update(&key->md,out+md5_off,plen-md5_off);
 
                        /* calculate HMAC and verify it */
@@ -207,7 +208,7 @@ static int rc4_hmac_md5_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                }
        }
 
-       key->payload_length = 0;
+       key->payload_length = NO_PAYLOAD_LENGTH;
 
        return 1;
        }
@@ -288,6 +289,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