diff options
author | Andy Polyakov <appro@openssl.org> | 2012-04-20 21:45:21 +0000 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2012-04-20 21:45:21 +0000 |
commit | 6ca7af9ec01a8b2312838f12f592f8075069574d (patch) | |
tree | 0d2f4c2418fc93a4e89dd2314bf108584f1fa7d2 /crypto/evp | |
parent | bc2c8efc8079cea54305fe6f8a55f419fe3e6a86 (diff) |
e_rc4_hmac_md5.c: reapply commit#21726, which was erroneously omitted [from 1.0.1].
PR: 2797, 2792
Diffstat (limited to 'crypto/evp')
-rw-r--r-- | crypto/evp/e_rc4_hmac_md5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/e_rc4_hmac_md5.c b/crypto/evp/e_rc4_hmac_md5.c index 649fcadd98..56563191ba 100644 --- a/crypto/evp/e_rc4_hmac_md5.c +++ b/crypto/evp/e_rc4_hmac_md5.c @@ -103,7 +103,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 |