From cd7b854bbbfe368f09204bee105551e7f25a707c Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Tue, 15 Nov 2011 12:39:48 +0000
Subject: [PATCH] e_rc4_hmac_md5.c: make it work on darwin64, which is
 configured with RC4_CHAR.

---
 crypto/evp/e_rc4_hmac_md5.c | 3 ++-
 crypto/rc4/rc4test.c        | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 94c011000c..eaa7a5312c 100644
--- a/crypto/evp/e_rc4_hmac_md5.c
+++ b/crypto/evp/e_rc4_hmac_md5.c
@@ -101,7 +101,8 @@ 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(__INTEL__)		) && \
+	!(defined(__APPLE__) && defined(__MACH__))
 #define	STITCHED_CALL
 #endif
 
diff --git a/crypto/rc4/rc4test.c b/crypto/rc4/rc4test.c
index 633a79e758..4312605ccb 100644
--- a/crypto/rc4/rc4test.c
+++ b/crypto/rc4/rc4test.c
@@ -120,6 +120,12 @@ int main(int argc, char *argv[])
 	RC4_KEY key;
 	unsigned char obuf[512];
 
+#if !defined(OPENSSL_PIC)
+	void OPENSSL_cpuid_setup(void);
+
+	OPENSSL_cpuid_setup();
+#endif
+
 	for (i=0; i<6; i++)
 		{
 		RC4_set_key(&key,keys[i][0],&(keys[i][1]));
-- 
2.25.1