e_rc4_hmac_md5.c: make it work on darwin64, which is configured with RC4_CHAR.

diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c
index 94c011000c483b2d9fca30d788e369d699f66b4c..eaa7a5312c71641976922be8a1b818d4c577fbad 100644 (file)
--- 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 633a79e75890f290b1dc5851dc1c06df6393a696..4312605ccbca8dbcac4c3cecf6d62e99baff36ac 100644 (file)
--- 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]));